Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp13544713rwd; Sat, 24 Jun 2023 02:10:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6sfQmU23M2il0Qe2z5FW5LOT9I6VbbARJI459S0FjPm4KTKahv0lIjMpX4S4kNjY75JTP5 X-Received: by 2002:a05:6a20:7289:b0:10e:dc7d:cbbe with SMTP id o9-20020a056a20728900b0010edc7dcbbemr37690346pzk.25.1687597805449; Sat, 24 Jun 2023 02:10:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687597805; cv=none; d=google.com; s=arc-20160816; b=CiT0YCz36Gh23G7Uze/KKgcKc7ZP+c7gQ0JvJR5IWxevg3VGZtg2G5kaHys7ww7eRV h7zFZJc2qEKAMdwFako+xklAfo3rW9wJxKb/Uw1JW9qiZ7rQui2mChXFbfMAJBkOiA+g YizOjimimmhxKdov/8NV6vseUoddzIFooNhPk+4ui12vf1oxXn63UJDEd8L6cklfmGfa 8VDlDpnVdxxOF2hDMZBz20qeMNulnCaigEVmGZoWTpVG1fLTNGq+6SMH7O0ixM98XpJN 0RPOlvAkDOt5clYCmk6pWrKvTE5Q8UkzInAwxSKJlR/rkt3EqbeoBkYJQBh3yQUnhTiY pR6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=oIBYslblOctDgmeuid7XuyqEOXErfDHKQ06ITsadHWU=; fh=opu+cKmZC/uSMG2qmKGC187UT+r4xRWK2Hiwit6u2Dg=; b=KN2dePYNCljMDXiutVMVRfiHu6T6NJ+gV6FE5cNPAe/CimzLE77T1S3ujh8jUPDYIC x6m0E5S2eEyLsXVukkQIg8xI3xHW/ygNNMdmW0kRNoAiPV+BAT445mbcbEgUfZ+3Ct/b gk2lGeC/MXYtB2wzFNp5ya0WwwJA//dhwdLRRM92uEjIYutyZQ7GZbX3MT++yCyZGfzS Wl/l2iZBYa1QHugVQUqrLh744THbKrn3kdx0UFU33B6HPtULikdV3nCCgo1EcnPpSili 0tDhfeFX4+Jrf2edTg/kK/pkMuyva8Ux8x09TU0+SoNMjnEphDDH6vLcYdjoM3uH8FPY zLpg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t19-20020a056a0021d300b0066677af9774si942918pfj.243.2023.06.24.02.09.52; Sat, 24 Jun 2023 02:10:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232650AbjFXJCC (ORCPT + 99 others); Sat, 24 Jun 2023 05:02:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229534AbjFXJB6 (ORCPT ); Sat, 24 Jun 2023 05:01:58 -0400 X-Greylist: delayed 1157 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Sat, 24 Jun 2023 02:01:54 PDT Received: from 9.mo562.mail-out.ovh.net (9.mo562.mail-out.ovh.net [46.105.72.114]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D9FD1B4 for ; Sat, 24 Jun 2023 02:01:53 -0700 (PDT) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id B32E322F72; Sat, 24 Jun 2023 08:42:34 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for ; Sat, 24 Jun 2023 08:42:34 +0000 (UTC) Received: from pro2.mail.ovh.net (unknown [10.108.20.150]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 5F7ED2011DF; Sat, 24 Jun 2023 08:42:34 +0000 (UTC) Received: from traphandler.com (88.161.25.233) by DAG1EX1.emp2.local (172.16.2.1) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Sat, 24 Jun 2023 10:42:33 +0200 From: Jean-Jacques Hiblot To: , , , , CC: , , , Jean-Jacques Hiblot Subject: [PATCH v10 3/5] leds: class: store the color index in struct led_classdev Date: Sat, 24 Jun 2023 10:42:15 +0200 Message-ID: <20230624084217.3079205-4-jjhiblot@traphandler.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230624084217.3079205-1-jjhiblot@traphandler.com> References: <20230624084217.3079205-1-jjhiblot@traphandler.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [88.161.25.233] X-ClientProxiedBy: DAG2EX1.emp2.local (172.16.2.11) To DAG1EX1.emp2.local (172.16.2.1) X-Ovh-Tracer-Id: 12428246123187419611 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrgeegjedgtdejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgtghisehtkeertdertddtnecuhfhrohhmpeflvggrnhdqlfgrtghquhgvshcujfhisghlohhtuceojhhjhhhisghlohhtsehtrhgrphhhrghnughlvghrrdgtohhmqeenucggtffrrghtthgvrhhnpeduteevleevvefggfdvueffffejhfehheeuiedtgedtjeeghfehueduudegfeefueenucfkpheptddrtddrtddrtddpkeekrdduiedurddvhedrvdeffeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhhouggvpehsmhhtphhouhhtpdhhvghlohepughirhgvtghtohhruddruggvrhhprdhmrghilhdqohhuthdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomhepjhhjhhhisghlohhtsehtrhgrphhhrghnughlvghrrdgtohhmpdhnsggprhgtphhtthhopedupdhrtghpthhtoheplhhinhhugidqlhgvughssehvghgvrhdrkhgvrhhnvghlrdhorhhgpdfovfetjfhoshhtpehmohehiedv X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This information might be useful for more than only deriving the led's name. And since we have this information, we can expose it in the sysfs. Signed-off-by: Jean-Jacques Hiblot --- Documentation/ABI/testing/sysfs-class-led | 9 +++++++++ drivers/leds/led-class.c | 20 ++++++++++++++++++++ include/linux/leds.h | 1 + 3 files changed, 30 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-class-led b/Documentation/ABI/testing/sysfs-class-led index 2e24ac3bd7ef..1509e71fcde1 100644 --- a/Documentation/ABI/testing/sysfs-class-led +++ b/Documentation/ABI/testing/sysfs-class-led @@ -59,6 +59,15 @@ Description: brightness. Reading this file when no hw brightness change event has happened will return an ENODATA error. +What: /sys/class/leds//color +Date: June 2023 +KernelVersion: 6.5 +Description: + Color of the led. + + This is a read-only file. Reading this file returns the color + of the led as a string (ex: "red", "green", "multicolor"). + What: /sys/class/leds//trigger Date: March 2006 KernelVersion: 2.6.17 diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c index eb1a8494dc5b..6cca21b227dd 100644 --- a/drivers/leds/led-class.c +++ b/drivers/leds/led-class.c @@ -76,6 +76,18 @@ static ssize_t max_brightness_show(struct device *dev, } static DEVICE_ATTR_RO(max_brightness); +static ssize_t color_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + const char *color_text = "invalid"; + struct led_classdev *led_cdev = dev_get_drvdata(dev); + + if (led_cdev->color < LED_COLOR_ID_MAX) + color_text = led_colors[led_cdev->color]; + return sysfs_emit(buf, "%s\n", color_text); +} +static DEVICE_ATTR_RO(color); + #ifdef CONFIG_LEDS_TRIGGERS static BIN_ATTR(trigger, 0644, led_trigger_read, led_trigger_write, 0); static struct bin_attribute *led_trigger_bin_attrs[] = { @@ -90,6 +102,7 @@ static const struct attribute_group led_trigger_group = { static struct attribute *led_class_attrs[] = { &dev_attr_brightness.attr, &dev_attr_max_brightness.attr, + &dev_attr_color.attr, NULL, }; @@ -482,6 +495,10 @@ int led_classdev_register_ext(struct device *parent, if (fwnode_property_present(init_data->fwnode, "retain-state-shutdown")) led_cdev->flags |= LED_RETAIN_AT_SHUTDOWN; + + if (fwnode_property_present(init_data->fwnode, "color")) + fwnode_property_read_u32(init_data->fwnode, "color", + &led_cdev->color); } } else { proposed_name = led_cdev->name; @@ -491,6 +508,9 @@ int led_classdev_register_ext(struct device *parent, if (ret < 0) return ret; + if (led_cdev->color >= LED_COLOR_ID_MAX) + dev_warn(parent, "LED %s color identifier out of range\n", final_name); + mutex_init(&led_cdev->led_access); mutex_lock(&led_cdev->led_access); led_cdev->dev = device_create_with_groups(leds_class, parent, 0, diff --git a/include/linux/leds.h b/include/linux/leds.h index 95311c70d95c..487d00dac4de 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -100,6 +100,7 @@ struct led_classdev { const char *name; unsigned int brightness; unsigned int max_brightness; + unsigned int color; int flags; /* Lower 16 bits reflect status */ -- 2.34.1