Commit ec9aa897 authored by Aren Moynihan's avatar Aren Moynihan Committed by Lee Jones
Browse files

leds: rgb: leds-group-multicolor: Allow LEDs to stay on in suspend 



If none of the managed LEDs enable LED_CORE_SUSPENDRESUME, then we
shouldn't need to set it here. This makes it possible to use multicolor
groups with GPIO LEDs that enable retain-state-suspended in the device
tree.

Signed-off-by: default avatarAren Moynihan <aren@peacevolution.org>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Link: https://lore.kernel.org/r/20240206185400.596979-1-aren@peacevolution.org


[Lee: Changed the comment to respect proper grammar]
Signed-off-by: default avatarLee Jones <lee@kernel.org>
parent 415798bc

drivers/leds/rgb/leds-group-multicolor.c

+6 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static int leds_gmc_probe(struct platform_device *pdev) 
	struct mc_subled *subled;

	struct leds_multicolor *priv;

	unsigned int max_brightness = 0;

	int i, ret, count = 0;

	int i, ret, count = 0, common_flags = 0;



	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);

	if (!priv)
@@ -91,6 +91,7 @@ static int leds_gmc_probe(struct platform_device *pdev) 
		if (!priv->monochromatics)

			return -ENOMEM;



		common_flags |= led_cdev->flags;

		priv->monochromatics[count] = led_cdev;



		max_brightness = max(max_brightness, led_cdev->max_brightness);
@@ -114,12 +115,15 @@ static int leds_gmc_probe(struct platform_device *pdev) 


	/* Initialise the multicolor's LED class device */

	cdev = &priv->mc_cdev.led_cdev;

	cdev->flags = LED_CORE_SUSPENDRESUME;

	cdev->brightness_set_blocking = leds_gmc_set;

	cdev->max_brightness = max_brightness;

	cdev->color = LED_COLOR_ID_MULTI;

	priv->mc_cdev.num_colors = count;



	/* we only need suspend/resume if a sub-led requests it */

	if (common_flags & LED_CORE_SUSPENDRESUME)

		cdev->flags = LED_CORE_SUSPENDRESUME;



	init_data.fwnode = dev_fwnode(dev);

	ret = devm_led_classdev_multicolor_register_ext(dev, &priv->mc_cdev, &init_data);

	if (ret)