From: Aren Moynihan <aren@peacevolution.org>
To: linux-kernel@vger.kernel.org
Cc: Miles Alan <m@milesalan.com>, Ondrej Jirman <megi@xff.cz>,
Aren Moynihan <aren@peacevolution.org>,
Jean-Jacques Hiblot <jjhiblot@traphandler.com>,
Lee Jones <lee@kernel.org>, Pavel Machek <pavel@ucw.cz>,
linux-leds@vger.kernel.org
Subject: [PATCH 1/4] leds: rgb: leds-group-multicolor: allow leds to stay on in suspend
Date: Sun, 28 Jan 2024 15:45:07 -0500 [thread overview]
Message-ID: <20240128204740.2355092-1-aren@peacevolution.org> (raw)
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: Aren Moynihan <aren@peacevolution.org>
---
drivers/leds/rgb/leds-group-multicolor.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/leds/rgb/leds-group-multicolor.c b/drivers/leds/rgb/leds-group-multicolor.c
index 39f58be32af5..194c6a33640b 100644
--- a/drivers/leds/rgb/leds-group-multicolor.c
+++ b/drivers/leds/rgb/leds-group-multicolor.c
@@ -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, 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)
--
2.43.0
next reply other threads:[~2024-01-28 20:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-28 20:45 Aren Moynihan [this message]
2024-01-28 20:45 ` [PATCH 2/4] arm64: dts: sun50i-a64-pinephone: Retain leds state in suspend Aren Moynihan
2024-01-30 19:06 ` Jernej Škrabec
2024-02-01 1:36 ` Aren
2024-02-01 19:54 ` Jernej Škrabec
2024-01-28 20:45 ` [PATCH 3/4] arm64: dts: sun50i-a64-pinephone: add multicolor led node Aren Moynihan
2024-01-30 19:41 ` Jernej Škrabec
2024-02-01 1:28 ` Aren
2024-01-28 20:45 ` [PATCH 4/4] arm64: dts: sun50i-a64-pinephone: change led type to status Aren Moynihan
2024-01-31 7:39 ` [PATCH 1/4] leds: rgb: leds-group-multicolor: allow leds to stay on in suspend Jean-Jacques Hiblot
2024-02-01 1:39 ` Aren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240128204740.2355092-1-aren@peacevolution.org \
--to=aren@peacevolution.org \
--cc=jjhiblot@traphandler.com \
--cc=lee@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=m@milesalan.com \
--cc=megi@xff.cz \
--cc=pavel@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).