From patchwork Tue Feb 6 18:13:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aren X-Patchwork-Id: 13547737 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 455F0C4828D for ; Tue, 6 Feb 2024 19:03:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Pnla8QUMscc0YdAhTIYLJ6WojANtJ2SvFBdhAyoSebA=; b=AZVuxIQOo7jrmu d+CvydrXjpO24mf9siukTrJHEWXnsXlIHn/Ue9zMOYHVxrbH995jnpm1dHD4JLQkNhJFq1I2K2fMh 5CnvNMHYkzoIjEvU6hv9SBXDYFSgHgfJGrZdLy889RjCYZahiqcWIPLrih1E2FToUax9iOO1xGm4L Hwh16W+Wask3lGbmFr2uEYFmaW/1vcepIbekqyjCtQQHQbC7A8erMvMs4zQmeK8LGu3+5vwQuII+J 9GHFMBmicLCLzFpBDFNX2d1zfiZVbda/1p8GiPleB9wRHbAAl5dnVLjfQTU4Z3EZne7oTCHC2Hvb6 QO9MSvJX1a10AcTxgawg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rXQih-00000008chC-3agi; Tue, 06 Feb 2024 19:02:59 +0000 Received: from a.peacevolution.org ([206.189.193.133]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rXQif-00000008cg0-3s1b for linux-arm-kernel@lists.infradead.org; Tue, 06 Feb 2024 19:02:59 +0000 Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by a.peacevolution.org (Postfix) with ESMTPA id DD9644583E; Tue, 6 Feb 2024 19:02:48 +0000 (UTC) From: Aren Moynihan To: linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org, Jean-Jacques Hiblot , Chen-Yu Tsai , Ondrej Jirman , linux-sunxi@lists.linux.dev, Lee Jones , Pavel Machek , linux-arm-kernel@lists.infradead.org, Jernej Skrabec , linux-leds@vger.kernel.org, Conor Dooley , Miles Alan , Samuel Holland , Aren Moynihan Subject: [PATCH v2 1/4] leds: rgb: leds-group-multicolor: allow leds to stay on in suspend Date: Tue, 6 Feb 2024 13:13:17 -0500 Message-ID: <20240206185400.596979-1-aren@peacevolution.org> MIME-Version: 1.0 Authentication-Results: auth=pass smtp.auth=aren@peacevolution.org smtp.mailfrom=aren@peacevolution.org X-Spamd-Bar: ++++ DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=peacevolution.org; s=dkim; t=1707246170; h=from:subject:date:message-id:to:cc:mime-version:content-transfer-encoding; bh=NQIirmVOCAxOql2DLF2KDYdkndurgToAOXdUzzfrUao=; b=AD8RDoDqSuMzuW8WjS6hsO4Ihd7f8WOWW5QsXpSI7G+B3S/ZAOv9zFcgzVMoPwDLVcGvsZ 3jyUXi4dQD42GwETLjspanbyyc4gtnAGlP9du/NQeqpq3AQNfhm+zqS098d0N0cu3STJr2 Os7WmPNxQ97X0MQofjfo76Zlw56NSU0= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240206_110258_056749_35FC66FB X-CRM114-Status: GOOD ( 13.37 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 Acked-by: Pavel Machek --- Changes in v2: - make sure count gets initialized - send the patch to (hopefully) all the correct people this time 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..b6c7679015fd 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 = 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)