Add generic support for composing LED class device name
Subsystems (4)
v3 cover Add generic support for composing LED class device name
Changes from v2:
- removed from drivers the responsibility of calling led_compose_name()
- added struct device* argument to led_compose_name() to allow using dev_<level> logging functions for more informative logs
- adjusted the list of LED_FUNCTION definitions according to the v2 review remarks
- renamed default_desc to default_label in the struct led_init_data
- added led-enumerator DT property to the common LED bindings
- removed LED_COLOR_NAME definitions from include/dt-bindings/leds/common.h
- change DT color property type from string to integer
- change struct initialization list to explicit property assignment in leds-sc27xx-bltc.c
- use led->client->name for led_hw_name in leds-lm3692x.c
- few other minor improvements to docs etc.
Changes from v1:
- improved led_parse_properties() to parse label property at first and return immediately after parsing succeeds
- added tool get_led_device_info.sh for retrieving LED class device's parent device related information
- extended LED naming section of Documentation/leds/leds-class.txt
- adjusted the list of LED_FUNCTION definitions according to the v1 review remarks
- added standard LED_COLOR_NAME definitions
- removed functions.h and moved both LED_FUNCTION and LED_COLOR_NAME definitions to include/dt-bindings/common.h
- rebased leds-as3645a changes on top of the patch switching to fwnode property API
- updated DT bindings to use new LED_COLOR_NAME definitions
- improved common LED bindings to not use address unit for sub-nodes without reg property
Generally I still insist on deprecating label property and devicename section of LED name. The tool I added for obtaining LED device name proves availability of the related information in other places in the sysfs. Other discussed use cases are covered in the updated Documentation/leds/leds-class.txt.
Beside that, I tried also to create macros for automatic composition of "-N" suffixed LED functions, so that it would not be necessary to pollute common.h with plenty repetitions of the same function, differing only with the postfix. Unfortunately, the preprocessor of the dtc compiler seems not to accept string concatenetation. I.e. it is not possible to to the following assighment:
function = "hdd""-1"
If anyone knows how to obviate this shortocoming please let me know.
Original cover letter:
LED class device naming pattern included devicename section, which had unpleasant effect of varying userspace interface dependent on underlaying hardware. Moreover, this information was redundant in the LED name, since the LED controller name could have been obtained from sysfs device group
This patch set introduces a led_compose_name() function in the LED core, which unifies and simplifies LED class device name composition. This change is accompanied by the improvements in the common LED DT bindings where two new properties are introduced: "function" and "color" . The two deprecate the old "label" property which was leaving too much room for interpretation, leading to inconsistent LED naming.
There are also changes in LED DT node naming, which are in line with DT maintainer's request from [0].
Since some DT LED naming unification, related to not including devicename section in "label" DT property, is being requested during reviews of new LED class drivers for almost a year now, then those drivers are the first candidates for optimalization and the first users of the new led_compose_name() API. The modifications were tested with Qemu, by stubbing the driver internals where hardware interaction was needed for proper probing.
Thanks,
Jacek Anaszewski
Jacek Anaszewski (25):
leds: class: Improve LED and LED flash class registration API
dt-bindings: leds: Add LED_FUNCTION definitions
dt-bindings: leds: Add LED_COLOR_ID definitions
dt-bindings: leds: Add function, color and led-enumerator properties
leds: core: Add support for composing LED class device names
dt-bindings: sc27xx-blt: Add function and color properties
leds: sc27xx-blt: Use generic support for composing LED names
dt-bindings: lt3593: Add function and color properties
leds: lt3593: Use generic support for composing LED names
dt-bindings: lp8860: Add function and color properties
leds: lp8860: Use generic support for composing LED names
dt-bindings: lm3692x: Add function and color properties
leds: lm3692x: Use generic support for composing LED names
dt-bindings: lm36010: Add function and color properties
leds: lm3601x: Use generic support for composing LED names
dt-bindings: cr0014114: Add function and color properties
leds: cr0014114: Use generic support for composing LED names
dt-bindings: aat1290: Add function and color properties
leds: aat1290: Use generic support for composing LED names
dt-bindings: as3645a: Add function and color properties
leds: as3645a: Use generic support for composing LED names
dt-bindings: leds-gpio: Add function and color properties
leds: gpio: Use generic support for composing LED names
dt-bindings: an30259a: Add function and color properties
leds: an30259a: Use generic support for composing LED names
.../devicetree/bindings/leds/ams,as3645a.txt | 22 +++-- Documentation/devicetree/bindings/leds/common.txt | 61 ++++++++++++-- .../devicetree/bindings/leds/leds-aat1290.txt | 12 ++- .../devicetree/bindings/leds/leds-an30259a.txt | 22 +++-- .../devicetree/bindings/leds/leds-cr0014114.txt | 26 ++++-- .../devicetree/bindings/leds/leds-gpio.txt | 23 ++++-- .../devicetree/bindings/leds/leds-lm3601x.txt | 10 ++- .../devicetree/bindings/leds/leds-lm3692x.txt | 9 +- .../devicetree/bindings/leds/leds-lp8860.txt | 9 +- .../devicetree/bindings/leds/leds-lt3593.txt | 11 ++- .../devicetree/bindings/leds/leds-sc27xx-bltc.txt | 10 ++- Documentation/leds/leds-class.txt | 27 +++++- drivers/leds/led-class-flash.c | 9 +- drivers/leds/led-class.c | 58 +++++++++---- drivers/leds/led-core.c | 96 ++++++++++++++++++++++ drivers/leds/leds-aat1290.c | 14 ++-- drivers/leds/leds-an30259a.c | 25 +++--- drivers/leds/leds-as3645a.c | 69 ++++++---------- drivers/leds/leds-cr0014114.c | 33 +++----- drivers/leds/leds-gpio.c | 23 +++--- drivers/leds/leds-lm3601x.c | 38 ++++----- drivers/leds/leds-lm3692x.c | 22 ++--- drivers/leds/leds-lp8860.c | 35 ++++---- drivers/leds/leds-lt3593.c | 20 ++--- drivers/leds/leds-sc27xx-bltc.c | 22 ++--- include/dt-bindings/leds/common.h | 47 +++++++++++ include/linux/led-class-flash.h | 15 ++-- include/linux/leds.h | 78 +++++++++++++++--- tools/leds/get_led_device_info.sh | 81 ++++++++++++++++++ 29 files changed, 660 insertions(+), 267 deletions(-) create mode 100755 tools/leds/get_led_device_info.sh
Signature · 1 line
2.11.0
PATCH v3 1/25 leds: class: Improve LED and LED flash class registration API
Replace of_led_classdev_register() with led_classdev_register_ext(), which accepts easily extendable struct led_init_data, instead of the fixed struct device_node argument. The latter can be now passed in a fwnode property of the struct led_init_data.
The modification is driven by the need for passing another argument to the LED class initialization function - a LED class device name. Currently it is conveyed in the "name" char pointer property of struct led_classdev, which is semantically and functionally incorrect since it is needed only on LED class device registration, but persists in system memory throughout the whole LED class device lifetime.
Whereas in case of the name strings coming from DT "label" property or statically initialized ones the cost is only the pointer size, it grows to LED_MAX_NAME_SIZE (64) with the advent of a new LED class device naming scheme, where color and function properties come from separate board firmware properties and the name needs to be constructed in a new buffer.
The change will not break any existing clients since the patch alters also existing led_classdev{_flash}_register() macro wrappers, that pass NULL in place of init_data, which leads to using legacy name initialization path basing on the struct led_classdev's "name" property.
Two existing users of devm_of_led_classdev_registers() are modified to use devm_led_classdev_register(), which will not impact their operation since they in fact didn't need to pass struct device_node on registration from the beginning.
--- drivers/leds/led-class-flash.c | 9 +++++---- drivers/leds/led-class.c | 29 +++++++++++++++++------------ drivers/leds/leds-cr0014114.c | 3 +-- drivers/leds/leds-gpio.c | 2 +- include/linux/led-class-flash.h | 15 ++++++++++----- include/linux/leds.h | 35 +++++++++++++++++++++++++---------- 6 files changed, 59 insertions(+), 34 deletions(-)
drivers/leds/led-class-flash.c +5 -4
@@ -285,8 +285,9 @@ static void led_flash_init_sysfs_groups(struct led_classdev_flash *fled_cdev) led_cdev->groups = flash_groups; } -int led_classdev_flash_register (struct device *parent, -struct led_classdev_flash *fled_cdev) +int led_classdev_flash_register_ext (struct device *parent, +struct led_classdev_flash *fled_cdev, +struct led_init_data *init_data) {struct led_classdev *led_cdev;const struct led_flash_ops *ops;
@@ -312,13 +313,13 @@ int led_classdev_flash_register(struct device *parent, }/* Register led class device */ - ret =led_classdev_register (parent, led_cdev); + ret =led_classdev_register_ext (parent, led_cdev, init_data);if (ret <0 )return ret;return 0 ; } -EXPORT_SYMBOL_GPL (led_classdev_flash_register); +EXPORT_SYMBOL_GPL (led_classdev_flash_register_ext);void led_classdev_flash_unregister (struct led_classdev_flash *fled_cdev) {
drivers/leds/led-class.c +17 -12
@@ -17,6 +17,7 @@#include <linux/leds.h> #include <linux/list.h> #include <linux/module.h> +#include <linux/of.h> #include <linux/slab.h> #include <linux/spinlock.h> #include <linux/timer.h>
@@ -244,14 +245,16 @@ static int led_classdev_next_name(const char *init_name, char *name, }/** -* of_led_classdev_register - register a new object of led_classdev class. +* led_classdev_register_ext - register a new object of led_classdev class +* with init data. * * @parent: parent of LED device * @led_cdev: the led_classdev structure for this device. -* @np: DT node describing this LED +* @init_data: LED class device initialization data */ -int of_led_classdev_register (struct device *parent,struct device_node *np, -struct led_classdev *led_cdev) +int led_classdev_register_ext (struct device *parent, +struct led_classdev *led_cdev, +struct led_init_data *init_data) {char name[LED_MAX_NAME_SIZE ];int ret;
@@ -268,7 +271,8 @@ int of_led_classdev_register(struct device *parent, struct device_node *np,mutex_unlock (&led_cdev->led_access);return PTR_ERR (led_cdev->dev); } - led_cdev->dev->of_node = np; +if (init_data && init_data->fwnode) + led_cdev->dev->of_node =to_of_node (init_data->fwnode);if (ret) dev_warn(parent, "Led %s renamed to %s due to name collision",
@@ -313,7 +317,7 @@ int of_led_classdev_register(struct device *parent, struct device_node *np,return 0 ; } -EXPORT_SYMBOL_GPL (of_led_classdev_register); +EXPORT_SYMBOL_GPL (led_classdev_register_ext);/** * led_classdev_unregister - unregisters a object of led_properties class.
@@ -358,14 +362,15 @@ static void devm_led_classdev_release(struct device *dev, void *res) }/** -* devm_of_led_classdev_register - resource managed led_classdev_register() +* devm_led_classdev_register_ext - resource managed led_classdev_register_ext() * * @parent: parent of LED device * @led_cdev: the led_classdev structure for this device. +* @init_data: LED class device initialization data */ -int devm_of_led_classdev_register (struct device *parent, -struct device_node *np, -struct led_classdev *led_cdev) +int devm_led_classdev_register_ext (struct device *parent, +struct led_classdev *led_cdev, +struct led_init_data *init_data) {struct led_classdev **dr;int rc;
@@ -374,7 +379,7 @@ int devm_of_led_classdev_register(struct device *parent,if (!dr)return -ENOMEM ; - rc =of_led_classdev_register (parent, np, led_cdev); + rc =led_classdev_register_ext (parent, led_cdev, init_data);if (rc) {devres_free (dr);return rc;
@@ -385,7 +390,7 @@ int devm_of_led_classdev_register(struct device *parent,return 0 ; } -EXPORT_SYMBOL_GPL (devm_of_led_classdev_register); +EXPORT_SYMBOL_GPL (devm_led_classdev_register_ext);static int devm_led_classdev_match (struct device *dev,void *res,void *data) {
drivers/leds/leds-cr0014114.c +1 -2
@@ -207,8 +207,7 @@ static int cr0014114_probe_dt(struct cr0014114 *priv) led->ldev.max_brightness =CR_MAX_BRIGHTNESS ; led->ldev.brightness_set_blocking = cr0014114_set_sync; - ret =devm_of_led_classdev_register (priv->dev, np, - &led->ldev); + ret =devm_led_classdev_register (priv->dev, &led->ldev);if (ret) { dev_err(priv->dev, "failed to register LED device %s, err %d",
drivers/leds/leds-gpio.c +1 -1
@@ -112,7 +112,7 @@ static int create_gpio_led(const struct gpio_led *template,if (ret <0 )return ret; -return devm_of_led_classdev_register (parent, np, &led_dat->cdev); +return devm_led_classdev_register (parent, &led_dat->cdev); }struct gpio_leds_priv {
include/linux/led-class-flash.h +10 -5
@@ -90,15 +90,20 @@ static inline struct led_classdev_flash *lcdev_to_flcdev( }/** -* led_classdev_flash_register - register a new object of led_classdev class -* with support for flash LEDs -* @parent: the flash LED to register +* led_classdev_flash_register_ext - register a new object of LED class with +* init data and with support for flash LEDs +* @parent: LED flash controller device this flash LED is driven by * @fled_cdev: the led_classdev_flash structure for this device +* @init_data: the LED class flash device initialization data * * Returns: 0 on success or negative error value on failure */ -extern int led_classdev_flash_register (struct device *parent, -struct led_classdev_flash *fled_cdev); +extern int led_classdev_flash_register_ext (struct device *parent, +struct led_classdev_flash *fled_cdev, +struct led_init_data *init_data); + +#define led_classdev_flash_register (parent, fled_cdev) \ + led_classdev_flash_register_ext(parent, fled_cdev, NULL)/** * led_classdev_flash_unregister - unregisters an object of led_classdev class
include/linux/leds.h +25 -10
@@ -20,6 +20,7 @@#include <linux/spinlock.h> #include <linux/timer.h> #include <linux/workqueue.h> +#include <uapi/linux/uleds.h> struct device ;struct led_pattern ;
@@ -34,6 +35,11 @@ enum led_brightness { LED_FULL = 255, }; +struct led_init_data { +/* Device fwnode handle */ +struct fwnode_handle *fwnode; +}; +struct led_classdev {const char *name;enum led_brightness brightness;
@@ -129,16 +135,25 @@ struct led_classdev {struct mutex led_access; }; -extern int of_led_classdev_register (struct device *parent, -struct device_node *np, -struct led_classdev *led_cdev); -#define led_classdev_register (parent, led_cdev) \ - of_led_classdev_register(parent, NULL, led_cdev) -extern int devm_of_led_classdev_register (struct device *parent, -struct device_node *np, -struct led_classdev *led_cdev); -#define devm_led_classdev_register (parent, led_cdev) \ - devm_of_led_classdev_register(parent, NULL, led_cdev) +/** +* led_classdev_register_ext - register a new object of LED class with +* init data +* @parent: LED controller device this LED is driven by +* @led_cdev: the led_classdev structure for this device +* @init_data: the LED class device initialization data +* +* Returns: 0 on success or negative error value on failure +*/ +extern int led_classdev_register_ext (struct device *parent, +struct led_classdev *led_cdev, +struct led_init_data *init_data); +#define led_classdev_register (parent, led_cdev) \ + led_classdev_register_ext(parent, led_cdev, NULL) +extern int devm_led_classdev_register_ext (struct device *parent, +struct led_classdev *led_cdev, +struct led_init_data *init_data); +#define devm_led_classdev_register (parent, led_cdev) \ + devm_led_classdev_register_ext(parent, led_cdev, NULL)extern void led_classdev_unregister (struct led_classdev *led_cdev);extern void devm_led_classdev_unregister (struct device *parent,struct led_classdev *led_cdev);
Signature · 1 line
2.11.0
PATCH v3 2/25 dt-bindings: leds: Add LED_FUNCTION definitions
In reply to Jacek AnaszewskiAdd initial set of common LED function definitions for use in Device Tree.
--- include/dt-bindings/leds/common.h | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)
include/dt-bindings/leds/common.h +36 -0
@@ -19,4 +19,40 @@#define LEDS_BOOST_ADAPTIVE 1#define LEDS_BOOST_FIXED 2 +/* Standard LED functions */ +#define LED_FUNCTION_ACTIVITY "activity" +#define LED_FUNCTION_ALARM "alarm" +#define LED_FUNCTION_BACKLIGHT "backlight" +#define LED_FUNCTION_BLUETOOTH "bluetooth" +#define LED_FUNCTION_BOOT "boot" +#define LED_FUNCTION_CHARGE "charge" +#define LED_FUNCTION_DEBUG "debug" +#define LED_FUNCTION_DISK "disk" +#define LED_FUNCTION_DISK_ERR "disk-err" +#define LED_FUNCTION_DISK_READ "disk-read" +#define LED_FUNCTION_DISK_WRITE "disk-write" +#define LED_FUNCTION_FAULT "fault" +#define LED_FUNCTION_FLASH "flash" +#define LED_FUNCTION_HEARTBEAT "heartbeat" +#define LED_FUNCTION_INDICATOR "indicator" +#define LED_FUNCTION_KEYBOARD "keyboard" +#define LED_FUNCTION_KEYPAD "keypad" +#define LED_FUNCTION_LAN "lan" +#define LED_FUNCTION_MMC "mmc" +#define LED_FUNCTION_NAND "nand" +#define LED_FUNCTION_ON "on" +#define LED_FUNCTION_PROGRAMMING "programming" +#define LED_FUNCTION_POWER "power" +#define LED_FUNCTION_RX "rx" +#define LED_FUNCTION_SD "sd" +#define LED_FUNCTION_STANDBY "standby" +#define LED_FUNCTION_STATUS "status" +#define LED_FUNCTION_TORCH "torch" +#define LED_FUNCTION_TV "tv" +#define LED_FUNCTION_TX "tx" +#define LED_FUNCTION_USB "usb" +#define LED_FUNCTION_WAN "wan" +#define LED_FUNCTION_WLAN "wlan" +#define LED_FUNCTION_WPS "wps" +#endif /* __DT_BINDINGS_LEDS_H */
Signature · 1 line
2.11.0
Re: [PATCH v3 02/25] dt-bindings: leds: Add LED_FUNCTION definitions
Quoted 51 lines · Jacek Anaszewski
Add initial set of common LED function definitions for use in Device Tree.
Signed-off-by Jacek Anaszewski <[email protected]>Cc Baolin Wang <[email protected]>Cc Pavel Machek <[email protected]>Cc Dan Murphy <[email protected]>Cc Daniel Mack <[email protected]>Cc Linus Walleij <[email protected]>Cc Oleh Kravchenko <[email protected]>Cc Sakari Ailus <[email protected]>Cc Simon Shields <[email protected]>--- include/dt-bindings/leds/common.h | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)include/dt-bindings/leds/common.h +27
-0@@ -19,4 +19,40 @@#define LEDS_BOOST_ADAPTIVE 1#define LEDS_BOOST_FIXED 2 +/* Standard LED functions */ +#define LED_FUNCTION_ACTIVITY "activity" +#define LED_FUNCTION_ALARM "alarm" +#define LED_FUNCTION_BACKLIGHT "backlight" +#define LED_FUNCTION_BLUETOOTH "bluetooth" +#define LED_FUNCTION_BOOT "boot" +#define LED_FUNCTION_CHARGE "charge" +#define LED_FUNCTION_DEBUG "debug" +#define LED_FUNCTION_DISK "disk" +#define LED_FUNCTION_DISK_ERR "disk-err" +#define LED_FUNCTION_DISK_READ "disk-read" +#define LED_FUNCTION_DISK_WRITE "disk-write" +#define LED_FUNCTION_FAULT "fault" +#define LED_FUNCTION_FLASH "flash" +#define LED_FUNCTION_HEARTBEAT "heartbeat" +#define LED_FUNCTION_INDICATOR "indicator" +#define LED_FUNCTION_KEYBOARD "keyboard" +#define LED_FUNCTION_KEYPAD "keypad" +#define LED_FUNCTION_LAN "lan" +#define LED_FUNCTION_MMC "mmc" +#define LED_FUNCTION_NAND "nand" +#define LED_FUNCTION_ON "on" +#define LED_FUNCTION_PROGRAMMING "programming" +#define LED_FUNCTION_POWER "power" +#define LED_FUNCTION_RX "rx" +#define LED_FUNCTION_SD "sd" +#define LED_FUNCTION_STANDBY "standby"
include/dt-bindings/leds/common.h line 58
Quoted 10 lines
include/dt-bindings/leds/common.h +9
-0+#define LED_FUNCTION_STATUS "status" +#define LED_FUNCTION_TORCH "torch" +#define LED_FUNCTION_TV "tv" +#define LED_FUNCTION_TX "tx" +#define LED_FUNCTION_USB "usb" +#define LED_FUNCTION_WAN "wan" +#define LED_FUNCTION_WLAN "wlan" +#define LED_FUNCTION_WPS "wps" +#endif /* __DT_BINDINGS_LEDS_H */
Signature · 2 lines
------------------ Dan Murphy
PATCH v3 3/25 dt-bindings: leds: Add LED_COLOR_ID definitions
In reply to Jacek AnaszewskiAdd common LED color identifiers for use in Device Tree.
--- include/dt-bindings/leds/common.h | 11 +++++++++++ 1 file changed, 11 insertions(+)
include/dt-bindings/leds/common.h +11 -0
@@ -55,4 +55,15 @@#define LED_FUNCTION_WLAN "wlan"#define LED_FUNCTION_WPS "wps" +/* Standard LED colors */ +#define LED_COLOR_ID_WHITE 0 +#define LED_COLOR_ID_RED 1 +#define LED_COLOR_ID_GREEN 2 +#define LED_COLOR_ID_BLUE 3 +#define LED_COLOR_ID_AMBER 4 +#define LED_COLOR_ID_VIOLET 5 +#define LED_COLOR_ID_YELLOW 6 +#define LED_COLOR_ID_IR 7 +#define LED_COLOR_ID_COUNT 8 +#endif /* __DT_BINDINGS_LEDS_H */
Signature · 1 line
2.11.0
Re: [PATCH v3 03/25] dt-bindings: leds: Add LED_COLOR_ID definitions
Jacek
Quoted 26 lines · Jacek Anaszewski
Add common LED color identifiers for use in Device Tree.
Signed-off-by Jacek Anaszewski <[email protected]>Cc Baolin Wang <[email protected]>Cc Pavel Machek <[email protected]>Cc Dan Murphy <[email protected]>Cc Daniel Mack <[email protected]>Cc Linus Walleij <[email protected]>Cc Oleh Kravchenko <[email protected]>Cc Sakari Ailus <[email protected]>Cc Simon Shields <[email protected]>--- include/dt-bindings/leds/common.h | 11 +++++++++++ 1 file changed, 11 insertions(+)include/dt-bindings/leds/common.h +2
-0@@ -55,4 +55,15 @@#define LED_FUNCTION_WLAN "wlan"#define LED_FUNCTION_WPS "wps" +/* Standard LED colors */ +#define LED_COLOR_ID_WHITE 0
include/dt-bindings/leds/common.h line 69
Quoted 10 lines
include/dt-bindings/leds/common.h +9
-0+#define LED_COLOR_ID_RED 1 +#define LED_COLOR_ID_GREEN 2 +#define LED_COLOR_ID_BLUE 3 +#define LED_COLOR_ID_AMBER 4 +#define LED_COLOR_ID_VIOLET 5 +#define LED_COLOR_ID_YELLOW 6 +#define LED_COLOR_ID_IR 7 +#define LED_COLOR_ID_COUNT 8 +#endif /* __DT_BINDINGS_LEDS_H */
Signature · 2 lines
------------------ Dan Murphy
PATCH v3 4/25 dt-bindings: leds: Add function, color and led-enumerator properties
In reply to Jacek AnaszewskiIntroduce dedicated properties for conveying information about LED function and color. Mark old "label" property as deprecated.
Additionally led-enumerator property is being provided for the cases when neither function nor color can be used for LED differentiation.
--- Documentation/devicetree/bindings/leds/common.txt | 61 ++++++++++++++++++++--- 1 file changed, 53 insertions(+), 8 deletions(-)
Documentation/devicetree/bindings/leds/common.txt +53 -8
@@ -10,14 +10,29 @@ can influence the way of the LED device initialization, the LED components have to be tightly coupled with the LED device binding. They are represented by child nodes of the parent LED device binding. + Optional properties for child nodes: - led-sources : List of device current outputs the LED is connected to. The outputs are identified by the numbers that must be defined in the LED device binding documentation. + +- function: LED functon. Use one of the LED_FUNCTION_* prefixed definitions + from the header include/dt-bindings/leds/common.h. + If there is no matching LED_FUNCTION available, add a new one. + +- color : Color of the LED. Use one of the LED_COLOR_ID_* prefixed definitions + from the header include/dt-bindings/leds/common.h. + If there is no matching LED_COLOR_ID available, add a new one. + +- led-enumerator: Integer to be used for LED differentiation when neither + function nor color can be used for that purpose. + - label : The label for this LED. If omitted, the label is taken from the node name (excluding the unit address). It has to uniquely identify a device, i.e. no other LED class device can be assigned the same - label. + label. This property is deprecated - use 'function' and 'color' + properties instead. led-enumerator has no effect when this property + is present. - default-state : The initial state of the LED. Valid values are "on", "off", and "keep". If the LED is already on or off and the default-state property is
@@ -99,29 +114,59 @@ Required properties for trigger source: * Examples -gpio-leds { +#include <dt-bindings/leds/common.h> + +led-controller@0 { compatible = "gpio-leds"; - system-status { - label = "Status"; + led0 { + function = LED_FUNCTION_STATUS; linux,default-trigger = "heartbeat"; gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>; }; - usb { + led1 { + function = LED_FUNCTION_USB; gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>; trigger-sources = <&ohci_port1>, <&ehci_port1>; }; }; -max77693-led { +led-controller@0 { compatible = "maxim,max77693-led"; - camera-flash { - label = "Flash"; + led { + function = LED_FUNCTION_FLASH; + color = <LED_COLOR_ID_WHITE>; led-sources = <0>, <1>; led-max-microamp = <50000>; flash-max-microamp = <320000>; flash-max-timeout-us = <500000>; }; }; + +led-controller@30 { + compatible = "panasonic,an30259a"; + reg = <0x30>; + #address-cells = <1>; + #size-cells = <0>; + + led@1 { + reg = <1>; + linux,default-trigger = "heartbeat"; + function = LED_FUNCTION_INDICATOR; + led-enumerator = <1>; + }; + + led@2 { + reg = <2>; + function = LED_FUNCTION_INDICATOR; + led-enumerator = <2>; + }; + + led@3 { + reg = <3>; + function = LED_FUNCTION_INDICATOR; + led-enumerator = <3>; + }; +};
Signature · 1 line
2.11.0
PATCH v3 5/25 leds: core: Add support for composing LED class device names
In reply to Jacek AnaszewskiAdd generic support for composing LED class device name basing on fwnode_handle data. The function composes device name according to either a new <color:function> pattern or the legacy <devicename:color:function> pattern. The decision on using the particular pattern is made basing on whether fwnode contains new "function" and "color" properties, or the legacy "label" proeprty.
Backward compatibility with in-driver hard-coded LED class device names is assured thanks to the default_label and led_hw_name properties of newly introduced struct led_init_data.
In case none of the aforementioned properties was found, then, for OF nodes, the node name is adopted for LED class device name.
At the occassion of amending the Documentation/leds/leds-class.txt unify spelling: colour -> color.
Alongside these changes added is a new tool - tools/leds/get_led_device_info.sh. The tool allows retrieving details of a LED class device's parent device, which proves that getting rid of a devicename section from LED name pattern is justified since this information is already available in sysfs.
--- Documentation/leds/leds-class.txt | 27 +++++++++-- drivers/leds/led-class.c | 29 ++++++++++-- drivers/leds/led-core.c | 96 +++++++++++++++++++++++++++++++++++++++ include/linux/leds.h | 43 ++++++++++++++++++ tools/leds/get_led_device_info.sh | 81 +++++++++++++++++++++++++++++++++ 5 files changed, 270 insertions(+), 6 deletions(-) create mode 100755 tools/leds/get_led_device_info.sh
Documentation/leds/leds-class.txt +24 -3
@@ -43,14 +43,35 @@ LED Device Naming Is currently of the form: -"devicename:colour:function" - -There have been calls for LED properties such as colour to be exported as +"color:function" + +There might be still LED class drivers around using "devicename:color:function" +naming pattern, but the "devicename" section is now deprecated since it used +to convey information that was already available in the sysfs, like product +name. There is a tool (tools/leds/get_led_device_info.sh) available for +retrieving that information per a LED class device. + +Associations with other devices, like network ones, should be defined +via LED trigger mechanism. This approach is applied by some of wireless +network drivers that create triggers dynamically and incorporate phy +name into the trigger name. On the other hand input subsystem offers LED - input +bridge (drivers/input/input-leds.c) for exposing keyboard LEDs as LED class +devices. The get_led_device_info.sh script has support for retrieving related +input device node name. Should it support discovery of associations between +LEDs and other subsystems, please don't hesitate to submit a relevant patch. + +There have been calls for LED properties such as color to be exported as individual led class attributes. As a solution which doesn't incur as much overhead, I suggest these become part of the device name. The naming scheme above leaves scope for further attributes should they be needed. If sections of the name don't apply, just leave that section blank. +Please also keep in mind that LED subsystem has a protection against LED name +conflict. It adds numerical suffix (e.g. "_1", "_2", "_3" etc.) to the requested +LED class device name in case it is already in use. In order to prevent LED core +from assigning these suffixes in an arbitrary order the led-enumerator fwnode +property can be used for differentiation of LEDs that share common function +and/or color. In this case enumerators will be prepended with "-" character. Brightness setting API ======================
drivers/leds/led-class.c +26 -3
@@ -26,6 +26,18 @@static struct class *leds_class; +const char *led_colors[LED_COLOR_ID_COUNT ] = { + [LED_COLOR_ID_WHITE ] ="white" , + [LED_COLOR_ID_RED ] ="red" , + [LED_COLOR_ID_GREEN ] ="green" , + [LED_COLOR_ID_BLUE ] ="blue" , + [LED_COLOR_ID_AMBER ] ="amber" , + [LED_COLOR_ID_VIOLET ] ="violet" , + [LED_COLOR_ID_YELLOW ] ="yellow" , + [LED_COLOR_ID_IR ] ="ir" , +}; +EXPORT_SYMBOL_GPL (led_colors); +static ssize_t brightness_show (struct device *dev,struct device_attribute *attr,char *buf) {
@@ -256,17 +268,28 @@ int led_classdev_register_ext(struct device *parent,struct led_classdev *led_cdev, struct led_init_data *init_data) { - char name[LED_MAX_NAME_SIZE]; + char composed_name[LED_MAX_NAME_SIZE]; +char final_name[LED_MAX_NAME_SIZE ];int ret; - ret =led_classdev_next_name (led_cdev->name, name,sizeof (name)); +if (init_data) { + ret =led_compose_name (parent, init_data->fwnode, + init_data->led_hw_name, init_data->default_label, + composed_name); +if (ret <0 ) +return ret; + led_cdev->name = composed_name; + + } + + ret =led_classdev_next_name (led_cdev->name, final_name,sizeof (final_name));if (ret <0 )return ret;mutex_init (&led_cdev->led_access);mutex_lock (&led_cdev->led_access); led_cdev->dev =device_create_with_groups (leds_class, parent,0 , - led_cdev, led_cdev->groups,"%s" , name); + led_cdev, led_cdev->groups,"%s" , final_name);if (IS_ERR (led_cdev->dev)) {mutex_unlock (&led_cdev->led_access);return PTR_ERR (led_cdev->dev);
drivers/leds/led-core.c +96 -0
105 lines not on this page · raw message
include/linux/leds.h +43 -0
73 lines not on this page · raw message
tools/leds/get_led_device_info.sh new file +81 -0
81 lines not on this page · raw message
Signature · 1 line
2.11.0
Re: [PATCH v3 05/25] leds: core: Add support for composing LED class device names
Jacek
Quoted 93 lines · Jacek Anaszewski
Add generic support for composing LED class device name basing on
fwnode_handledata. The function composes device name according to either a new <color:function> pattern or the legacy <devicename:color:function> pattern. The decision on using the particular pattern is made basing on whether fwnode contains new "function" and "color" properties, or the legacy "label" proeprty.Backward compatibility with in-driver hard-coded LED class device names is assured thanks to the
default_labelandled_hw_nameproperties of newly introduced structled_init_data.In case none of the aforementioned properties was found, then, for OF nodes, the node name is adopted for LED class device name.
At the occassion of amending the
Documentation/leds/leds-class.txtunify spelling: colour -> color.Alongside these changes added is a new tool -
tools/leds/get_led_device_info.sh. The tool allows retrieving details of a LED class device's parent device, which proves that getting rid of a devicename section from LED name pattern is justified since this information is already available in sysfs.Signed-off-by Jacek Anaszewski <[email protected]>Cc Baolin Wang <[email protected]>Cc Pavel Machek <[email protected]>Cc Dan Murphy <[email protected]>Cc Daniel Mack <[email protected]>Cc Linus Walleij <[email protected]>Cc Oleh Kravchenko <[email protected]>Cc Sakari Ailus <[email protected]>Cc Simon Shields <[email protected]>--- Documentation/leds/leds-class.txt | 27 +++++++++-- drivers/leds/led-class.c | 29 ++++++++++-- drivers/leds/led-core.c | 96 +++++++++++++++++++++++++++++++++++++++ include/linux/leds.h | 43 ++++++++++++++++++ tools/leds/get_led_device_info.sh | 81 +++++++++++++++++++++++++++++++++ 5 files changed, 270 insertions(+), 6 deletions(-) create mode 100755 tools/leds/get_led_device_info.shDocumentation/leds/leds-class.txt +24
-3@@ -43,14 +43,35 @@ LED Device Naming Is currently of the form: -"devicename:colour:function" - -There have been calls for LED properties such as colour to be exported as +"color:function" + +There might be still LED class drivers around using "devicename:color:function" +naming pattern, but the "devicename" section is now deprecated since it used +to convey information that was already available in the sysfs, like product +name. There is a tool (tools/leds/get_led_device_info.sh) available for +retrieving that information per a LED class device. + +Associations with other devices, like network ones, should be defined +via LED trigger mechanism. This approach is applied by some of wireless +network drivers that create triggers dynamically and incorporate phy +name into the trigger name. On the other hand input subsystem offers LED - input +bridge (drivers/input/input-leds.c) for exposing keyboard LEDs as LED class +devices. The get_led_device_info.sh script has support for retrieving related +input device node name. Should it support discovery of associations between +LEDs and other subsystems, please don't hesitate to submit a relevant patch. + +There have been calls for LED properties such as color to be exported as individual led class attributes. As a solution which doesn't incur as much overhead, I suggest these become part of the device name. The naming scheme above leaves scope for further attributes should they be needed. If sections of the name don't apply, just leave that section blank. +Please also keep in mind that LED subsystem has a protection against LED name +conflict. It adds numerical suffix (e.g. "_1", "_2", "_3" etc.) to the requested +LED class device name in case it is already in use. In order to prevent LED core +from assigning these suffixes in an arbitrary order the led-enumerator fwnode +property can be used for differentiation of LEDs that share common function +and/or color. In this case enumerators will be prepended with "-" character. Brightness setting API ======================drivers/leds/led-class.c +2
-0@@ -26,6 +26,18 @@static struct class *leds_class; +const char *led_colors[LED_COLOR_ID_COUNT ] = { + [LED_COLOR_ID_WHITE ] ="white" ,
drivers/leds/led-class.c line 40
Quoted 10 lines
drivers/leds/led-class.c +10
-0+ [LED_COLOR_ID_RED] = "red", + [LED_COLOR_ID_GREEN] = "green", + [LED_COLOR_ID_BLUE] = "blue", + [LED_COLOR_ID_AMBER] = "amber", + [LED_COLOR_ID_VIOLET] = "violet", + [LED_COLOR_ID_YELLOW] = "yellow", + [LED_COLOR_ID_IR ] ="ir" , +}; +EXPORT_SYMBOL_GPL (led_colors); +
Why is this exported when it is only used here?
I can re-use this array for the multi color framework so I don't oppose it being exported.
Dan
<snip>--
------------------
Dan Murphy
Re: [PATCH v3 05/25] leds: core: Add support for composing LED class device names
Hi Dan,
Thank you for the review.
Quoted 109 lines · Dan Murphy
Jacek
Quoted 93 lines · Jacek Anaszewski
Add generic support for composing LED class device name basing on
fwnode_handledata. The function composes device name according to either a new <color:function> pattern or the legacy <devicename:color:function> pattern. The decision on using the particular pattern is made basing on whether fwnode contains new "function" and "color" properties, or the legacy "label" proeprty.Backward compatibility with in-driver hard-coded LED class device names is assured thanks to the
default_labelandled_hw_nameproperties of newly introduced structled_init_data.In case none of the aforementioned properties was found, then, for OF nodes, the node name is adopted for LED class device name.
At the occassion of amending the
Documentation/leds/leds-class.txtunify spelling: colour -> color.Alongside these changes added is a new tool -
tools/leds/get_led_device_info.sh. The tool allows retrieving details of a LED class device's parent device, which proves that getting rid of a devicename section from LED name pattern is justified since this information is already available in sysfs.Signed-off-by Jacek Anaszewski <[email protected]>Cc Baolin Wang <[email protected]>Cc Pavel Machek <[email protected]>Cc Dan Murphy <[email protected]>Cc Daniel Mack <[email protected]>Cc Linus Walleij <[email protected]>Cc Oleh Kravchenko <[email protected]>Cc Sakari Ailus <[email protected]>Cc Simon Shields <[email protected]>--- Documentation/leds/leds-class.txt | 27 +++++++++-- drivers/leds/led-class.c | 29 ++++++++++-- drivers/leds/led-core.c | 96 +++++++++++++++++++++++++++++++++++++++ include/linux/leds.h | 43 ++++++++++++++++++ tools/leds/get_led_device_info.sh | 81 +++++++++++++++++++++++++++++++++ 5 files changed, 270 insertions(+), 6 deletions(-)create mode 100755
tools/leds/get_led_device_info.shDocumentation/leds/leds-class.txt +24
-3@@ -43,14 +43,35 @@ LED Device Naming Is currently of the form: -"devicename:colour:function" - -There have been calls for LED properties such as colour to be exported as +"color:function" + +There might be still LED class drivers around using "devicename:color:function" +naming pattern, but the "devicename" section is now deprecated since it used +to convey information that was already available in the sysfs, like product +name. There is a tool (tools/leds/get_led_device_info.sh) available for +retrieving that information per a LED class device. + +Associations with other devices, like network ones, should be defined +via LED trigger mechanism. This approach is applied by some of wireless +network drivers that create triggers dynamically and incorporate phy +name into the trigger name. On the other hand input subsystem offers LED - input +bridge (drivers/input/input-leds.c) for exposing keyboard LEDs as LED class +devices. The get_led_device_info.sh script has support for retrieving related +input device node name. Should it support discovery of associations between +LEDs and other subsystems, please don't hesitate to submit a relevant patch. + +There have been calls for LED properties such as color to be exported as individual led class attributes. As a solution which doesn't incur as much overhead, I suggest these become part of the device name. The naming scheme above leaves scope for further attributes should they be needed. If sections of the name don't apply, just leave that section blank. +Please also keep in mind that LED subsystem has a protection against LED name +conflict. It adds numerical suffix (e.g. "_1", "_2", "_3" etc.) to the requested +LED class device name in case it is already in use. In order to prevent LED core +from assigning these suffixes in an arbitrary order the led-enumerator fwnode +property can be used for differentiation of LEDs that share common function +and/or color. In this case enumerators will be prepended with "-" character. Brightness setting API ======================drivers/leds/led-class.c +2
-0@@ -26,6 +26,18 @@static struct class *leds_class; +const char *led_colors[LED_COLOR_ID_COUNT ] = { + [LED_COLOR_ID_WHITE ] ="white" ,drivers/leds/led-class.c line 40
Quoted 10 lines
drivers/leds/led-class.c +10
-0+ [LED_COLOR_ID_RED] = "red", + [LED_COLOR_ID_GREEN] = "green", + [LED_COLOR_ID_BLUE] = "blue", + [LED_COLOR_ID_AMBER] = "amber", + [LED_COLOR_ID_VIOLET] = "violet", + [LED_COLOR_ID_YELLOW] = "yellow", + [LED_COLOR_ID_IR ] ="ir" , +}; +EXPORT_SYMBOL_GPL (led_colors); +Why is this exported when it is only used here?
Quoted 1 line
I can re-use this array for the multi color framework so I don't oppose it being exported.
I did that specifically for that purpose :-)
Quoted 1 line
Reviewed-by Dan Murphy <[email protected]>
Thanks!
Signature · 2 lines
Best regards, Jacek Anaszewski
PATCH v3 6/25 dt-bindings: sc27xx-blt: Add function and color properties
In reply to Jacek AnaszewskiRefer to new "function" and "color" properties and mark "label" as deprecated.
--- Documentation/devicetree/bindings/leds/leds-sc27xx-bltc.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/leds/leds-sc27xx-bltc.txt +6 -4
@@ -14,7 +14,9 @@ Required child properties: - reg: Port this LED is connected to. Optional child properties: -- label: See Documentation/devicetree/bindings/leds/common.txt. +- function: See Documentation/devicetree/bindings/leds/common.txt. +- color: See Documentation/devicetree/bindings/leds/common.txt. +- label: See Documentation/devicetree/bindings/leds/common.txt (deprecated). Examples:
@@ -25,17 +27,17 @@ led-controller@200 { reg = <0x200>; led@0 { - label = "red"; + color = <LED_COLOR_ID_RED>; reg = <0x0>; }; led@1 { - label = "green"; + color = <LED_COLOR_ID_GREEN>; reg = <0x1>; }; led@2 { - label = "blue"; + color = <LED_COLOR_ID_BLUE>; reg = <0x2>; }; };
Signature · 1 line
2.11.0
PATCH v3 7/25 leds: sc27xx-blt: Use generic support for composing LED names
In reply to Jacek AnaszewskiSwitch to using generic LED support for composing LED class device name.
--- drivers/leds/leds-sc27xx-bltc.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)
drivers/leds/leds-sc27xx-bltc.c +9 -13
@@ -6,7 +6,6 @@#include <linux/of.h> #include <linux/platform_device.h> #include <linux/regmap.h> -#include <uapi/linux/uleds.h> /* PMIC global control register definition */ #define SC27XX_MODULE_EN0 0xc08
@@ -46,7 +45,7 @@#define SC27XX_DELTA_T_MAX (SC27XX_LEDS_STEP * 255)struct sc27xx_led { -char name[LED_MAX_NAME_SIZE ]; +struct fwnode_handle *fwnode;struct led_classdev ldev;struct sc27xx_led_priv *priv;u8 line;
@@ -249,19 +248,24 @@ static int sc27xx_led_register(struct device *dev, struct sc27xx_led_priv *priv)for (i =0 ; i <SC27XX_LEDS_MAX ; i++) {struct sc27xx_led *led = &priv->leds[i]; +struct led_init_data init_data;if (!led->active)continue ; led->line = i; led->priv = priv; - led->ldev.name = led->name; led->ldev.brightness_set_blocking = sc27xx_led_set; led->ldev.pattern_set = sc27xx_led_pattern_set; led->ldev.pattern_clear = sc27xx_led_pattern_clear; led->ldev.default_trigger ="pattern" ; - err =devm_led_classdev_register (dev, &led->ldev); + init_data.fwnode = led->fwnode; + init_data.led_hw_name ="sc27xx" ; + init_data.default_label =":" ; + + err =devm_led_classdev_register_ext (dev, &led->ldev, + &init_data);if (err)return err; }
@@ -274,7 +278,6 @@ static int sc27xx_led_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct device_node *np = dev->of_node, *child;struct sc27xx_led_priv *priv; -const char *str;u32 base, count, reg;int err;
@@ -316,15 +319,8 @@ static int sc27xx_led_probe(struct platform_device *pdev)return -EINVAL ; } + priv->leds[reg].fwnode =of_fwnode_handle (child); priv->leds[reg].active = true; - - err =of_property_read_string (child,"label" , &str); -if (err) -snprintf (priv->leds[reg].name,LED_MAX_NAME_SIZE , -"sc27xx::" ); -else -snprintf (priv->leds[reg].name,LED_MAX_NAME_SIZE , -"sc27xx:%s" , str); } err =sc27xx_led_register (dev, priv);
Signature · 1 line
2.11.0
PATCH v3 8/25 dt-bindings: lt3593: Add function and color properties
In reply to Jacek AnaszewskiRefer to new "function" and "color" properties and mark "label" as deprecated.
--- Documentation/devicetree/bindings/leds/leds-lt3593.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/leds/leds-lt3593.txt +8 -3
@@ -9,8 +9,10 @@ The hardware supports only one LED. The properties of this LED are configured in a sub-node in the device node. Optional sub-node properties: -- label: A label for the LED. If none is given, the LED will be - named "lt3595::". +- function: See Documentation/devicetree/bindings/leds/common.txt +- color: See Documentation/devicetree/bindings/leds/common.txt +- label: A label for the LED. If none is given, the LED will be + named "lt3595::" (deprecated) - linux,default-trigger: The default trigger for the LED. See Documentation/devicetree/bindings/leds/common.txt - default-state: The initial state of the LED.
@@ -21,12 +23,15 @@ be handled by its own device node. Example: +#include <dt-bindings/leds/common.h> + led-controller { compatible = "lltc,lt3593"; lltc,ctrl-gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; led { - label = "white:backlight"; + function = LED_FUNCTION_BACKLIGHT; + color = <LED_COLOR_ID_WHITE>; default-state = "on"; }; };
Signature · 1 line
2.11.0
PATCH v3 9/25 leds: lt3593: Use generic support for composing LED names
In reply to Jacek AnaszewskiSwitch to using generic LED support for composing LED class device name.
--- drivers/leds/leds-lt3593.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
drivers/leds/leds-lt3593.c +8 -12
@@ -10,10 +10,10 @@#include <linux/slab.h> #include <linux/module.h> #include <linux/of.h> -#include <uapi/linux/uleds.h> + +#define LED_LT3593_NAME "lt3593"struct lt3593_led_data { -char name[LED_MAX_NAME_SIZE ];struct led_classdev cdev;struct gpio_desc *gpiod; };
@@ -66,6 +66,7 @@ static int lt3593_led_probe(struct platform_device *pdev)struct lt3593_led_data *led_data;struct fwnode_handle *child;int ret, state =LEDS_GPIO_DEFSTATE_OFF ; +struct led_init_data init_data;const char *tmp;if (!dev->of_node)
@@ -86,14 +87,6 @@ static int lt3593_led_probe(struct platform_device *pdev) child =device_get_next_child_node (dev,NULL ); - ret =fwnode_property_read_string (child,"label" , &tmp); -if (ret <0 ) -snprintf (led_data->name,sizeof (led_data->name), -"lt3593::" ); -else -snprintf (led_data->name,sizeof (led_data->name), -"lt3593:%s" , tmp); -fwnode_property_read_string (child,"linux,default-trigger" , &led_data->cdev.default_trigger);
@@ -102,11 +95,14 @@ static int lt3593_led_probe(struct platform_device *pdev) state =LEDS_GPIO_DEFSTATE_ON ; } - led_data->cdev.name = led_data->name; led_data->cdev.brightness_set_blocking = lt3593_led_set; led_data->cdev.brightness = state ?LED_FULL :LED_OFF ; - ret =devm_led_classdev_register (dev, &led_data->cdev); + init_data.fwnode = child; + init_data.led_hw_name =LED_LT3593_NAME ; + init_data.default_label =":" ; + + ret =devm_led_classdev_register_ext (dev, &led_data->cdev, &init_data);if (ret <0 ) {fwnode_handle_put (child);return ret;
Signature · 1 line
2.11.0
PATCH v3 10/25 dt-bindings: lp8860: Add function and color properties
In reply to Jacek AnaszewskiRefer to new "function" and "color" properties and mark "label" as deprecated.
--- Documentation/devicetree/bindings/leds/leds-lp8860.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/leds/leds-lp8860.txt +7 -2
@@ -20,12 +20,16 @@ Required child properties: - reg : 0 Optional child properties: - - label : see Documentation/devicetree/bindings/leds/common.txt + - function : see Documentation/devicetree/bindings/leds/common.txt + - color : see Documentation/devicetree/bindings/leds/common.txt + - label : see Documentation/devicetree/bindings/leds/common.txt (deprecated) - linux,default-trigger : see Documentation/devicetree/bindings/leds/common.txt Example: +#include <dt-bindings/leds/common.h> + led-controller@2d { compatible = "ti,lp8860"; #address-cells = <1>;
@@ -36,7 +40,8 @@ led-controller@2d { led@0 { reg = <0>; - label = "white:backlight"; + function = LED_FUNCTION_BACKLIGHT; + color = <LED_COLOR_ID_WHITE>; linux,default-trigger = "backlight"; }; }
Signature · 1 line
2.11.0
Re: [PATCH v3 10/25] dt-bindings: lp8860: Add function and color properties
Jacek
Quoted 33 lines · Jacek Anaszewski
Refer to new "function" and "color" properties and mark "label" as deprecated.
Signed-off-by Jacek Anaszewski <[email protected]>Cc Dan Murphy <[email protected]>--- Documentation/devicetree/bindings/leds/leds-lp8860.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)Documentation/devicetree/bindings/leds/leds-lp8860.txt +5
-1@@ -20,12 +20,16 @@ Required child properties: - reg : 0 Optional child properties: - - label : see Documentation/devicetree/bindings/leds/common.txt + - function : see Documentation/devicetree/bindings/leds/common.txt + - color : see Documentation/devicetree/bindings/leds/common.txt + - label : see Documentation/devicetree/bindings/leds/common.txt (deprecated) - linux,default-trigger : see Documentation/devicetree/bindings/leds/common.txt Example: +#include <dt-bindings/leds/common.h> + led-controller@2d { compatible = "ti,lp8860"; #address-cells = <1>;
Documentation/devicetree/bindings/leds/leds-lp8860.txt led-controller@2d { · line 47
Quoted 9 lines
Documentation/devicetree/bindings/leds/leds-lp8860.txt +2
-1@@ -36,7 +40,8 @@ led-controller@2d { led@0 { reg = <0>; - label = "white:backlight"; + function = LED_FUNCTION_BACKLIGHT; + color = <LED_COLOR_ID_WHITE>; linux,default-trigger = "backlight"; }; }
Signature · 2 lines
------------------ Dan Murphy
PATCH v3 11/25 leds: lp8860: Use generic support for composing LED names
In reply to Jacek AnaszewskiSwitch to using generic LED support for composing LED class device name.
While at it, avoid iterating through available child of nodes in favor of obtaining single expected child node using single call to of_get_next_available_child().
--- drivers/leds/leds-lp8860.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-)
drivers/leds/leds-lp8860.c +16 -19
@@ -22,7 +22,6 @@#include <linux/of_gpio.h> #include <linux/gpio/consumer.h> #include <linux/slab.h> -#include <uapi/linux/uleds.h> #define LP8860_DISP_CL1_BRT_MSB 0x00#define LP8860_DISP_CL1_BRT_LSB 0x01
@@ -87,6 +86,8 @@#define LP8860_CLEAR_FAULTS 0x01 +#define LP8860_NAME "lp8860" +/** * struct lp8860_led - * @lock - Lock for reading/writing the device
@@ -96,7 +97,6 @@* @eeprom_regmap - EEPROM register map * @enable_gpio - VDDIO/EN gpio to enable communication interface * @regulator - LED supply regulator pointer -* @label - LED label */ struct lp8860_led {struct mutex lock;
@@ -106,7 +106,6 @@ struct lp8860_led {struct regmap *eeprom_regmap;struct gpio_desc *enable_gpio;struct regulator *regulator; -char label[LED_MAX_NAME_SIZE ]; };struct lp8860_eeprom_reg {
@@ -387,25 +386,19 @@ static int lp8860_probe(struct i2c_client *client,struct lp8860_led *led;struct device_node *np = client->dev.of_node;struct device_node *child_node; -const char *name; +struct led_init_data init_data; led =devm_kzalloc (&client->dev,sizeof (*led),GFP_KERNEL );if (!led)return -ENOMEM ; -for_each_available_child_of_node (np, child_node) { - led->led_dev.default_trigger =of_get_property (child_node, -"linux,default-trigger" , -NULL ); - - ret =of_property_read_string (child_node,"label" , &name); -if (!ret) -snprintf (led->label,sizeof (led->label),"%s:%s" , - id->name, name); -else -snprintf (led->label,sizeof (led->label), -"%s::display_cluster" , id->name); - } + child_node =of_get_next_available_child (np,NULL ); +if (!child_node) +return -EINVAL ; + + led->led_dev.default_trigger =of_get_property (child_node, +"linux,default-trigger" , +NULL ); led->enable_gpio =devm_gpiod_get_optional (&client->dev,"enable" ,GPIOD_OUT_LOW );
@@ -420,7 +413,6 @@ static int lp8860_probe(struct i2c_client *client, led->regulator =NULL ; led->client = client; - led->led_dev.name = led->label; led->led_dev.brightness_set_blocking = lp8860_brightness_set;mutex_init (&led->lock);
@@ -447,7 +439,12 @@ static int lp8860_probe(struct i2c_client *client,if (ret)return ret; - ret =devm_led_classdev_register (&client->dev, &led->led_dev); + init_data.fwnode =of_fwnode_handle (child_node); + init_data.led_hw_name =LP8860_NAME ; + init_data.default_label =":display_cluster" ; + + ret =devm_led_classdev_register_ext (&client->dev, &led->led_dev, + &init_data);if (ret) {dev_err (&client->dev,"led register err: %d\n" , ret);return ret;
Signature · 1 line
2.11.0
Re: [PATCH v3 11/25] leds: lp8860: Use generic support for composing LED names
Jacek
Quoted 96 lines · Jacek Anaszewski
Switch to using generic LED support for composing LED class device name.
While at it, avoid iterating through available child of nodes in favor of obtaining single expected child node using single call to
of_get_next_available_child().Signed-off-by Jacek Anaszewski <[email protected]>Cc Dan Murphy <[email protected]>--- drivers/leds/leds-lp8860.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-)drivers/leds/leds-lp8860.c +10
-18@@ -22,7 +22,6 @@#include <linux/of_gpio.h> #include <linux/gpio/consumer.h> #include <linux/slab.h> -#include <uapi/linux/uleds.h> #define LP8860_DISP_CL1_BRT_MSB 0x00#define LP8860_DISP_CL1_BRT_LSB 0x01@@ -87,6 +86,8 @@#define LP8860_CLEAR_FAULTS 0x01 +#define LP8860_NAME "lp8860" +/** * struct lp8860_led - * @lock - Lock for reading/writing the device @@ -96,7 +97,6 @@* @eeprom_regmap - EEPROM register map * @enable_gpio - VDDIO/EN gpio to enable communication interface * @regulator - LED supply regulator pointer -* @label - LED label */ struct lp8860_led {struct mutex lock;@@ -106,7 +106,6 @@ struct lp8860_led {struct regmap *eeprom_regmap;struct gpio_desc *enable_gpio;struct regulator *regulator; -char label[LED_MAX_NAME_SIZE ]; };struct lp8860_eeprom_reg {@@ -387,25 +386,19 @@ static int lp8860_probe(struct i2c_client *client,struct lp8860_led *led;struct device_node *np = client->dev.of_node;struct device_node *child_node; -const char *name; +struct led_init_data init_data; led =devm_kzalloc (&client->dev,sizeof (*led),GFP_KERNEL );if (!led)return -ENOMEM ; -for_each_available_child_of_node (np, child_node) { - led->led_dev.default_trigger =of_get_property (child_node, -"linux,default-trigger" , -NULL ); - - ret =of_property_read_string (child_node,"label" , &name); -if (!ret) -snprintf (led->label,sizeof (led->label),"%s:%s" , - id->name, name); -else -snprintf (led->label,sizeof (led->label), -"%s::display_cluster" , id->name); - } + child_node =of_get_next_available_child (np,NULL ); +if (!child_node) +return -EINVAL ; + + led->led_dev.default_trigger =of_get_property (child_node, +"linux,default-trigger" , +NULL ); led->enable_gpio =devm_gpiod_get_optional (&client->dev,"enable" ,GPIOD_OUT_LOW );@@ -420,7 +413,6 @@ static int lp8860_probe(struct i2c_client *client, led->regulator =NULL ; led->client = client; - led->led_dev.name = led->label; led->led_dev.brightness_set_blocking = lp8860_brightness_set;mutex_init (&led->lock);@@ -447,7 +439,12 @@ static int lp8860_probe(struct i2c_client *client,if (ret)return ret;
drivers/leds/leds-lp8860.c static int lp8860_probe(struct i2c_client *client, · line 450
Quoted 10 lines
drivers/leds/leds-lp8860.c +6
-1- ret =devm_led_classdev_register (&client->dev, &led->led_dev); + init_data.fwnode =of_fwnode_handle (child_node); + init_data.led_hw_name =LP8860_NAME ; + init_data.default_label =":display_cluster" ; + + ret =devm_led_classdev_register_ext (&client->dev, &led->led_dev, + &init_data);if (ret) {dev_err (&client->dev,"led register err: %d\n" , ret);return ret;
PATCH v3 12/25 dt-bindings: lm3692x: Add function and color properties
In reply to Jacek AnaszewskiRefer to new "function" and "color" properties and mark "label" as deprecated.
--- Documentation/devicetree/bindings/leds/leds-lm3692x.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/leds/leds-lm3692x.txt +7 -2
@@ -26,12 +26,16 @@ Required child properties: 3 - Will enable the LED3 sync (LM36923 only) Optional child properties: - - label : see Documentation/devicetree/bindings/leds/common.txt + - function : see Documentation/devicetree/bindings/leds/common.txt + - color : see Documentation/devicetree/bindings/leds/common.txt + - label : see Documentation/devicetree/bindings/leds/common.txt (deprecated) - linux,default-trigger : see Documentation/devicetree/bindings/leds/common.txt Example: +#include <dt-bindings/leds/common.h> + led-controller@36 { compatible = "ti,lm3692x"; reg = <0x36>;
@@ -43,7 +47,8 @@ led-controller@36 { led@0 { reg = <0>; - label = "white:backlight_cluster"; + function = LED_FUNCTION_BACKLIGHT; + color = <LED_COLOR_ID_WHITE>; linux,default-trigger = "backlight"; }; }
Signature · 1 line
2.11.0
Re: [PATCH v3 12/25] dt-bindings: lm3692x: Add function and color properties
Jacek
Quoted 33 lines · Jacek Anaszewski
Refer to new "function" and "color" properties and mark "label" as deprecated.
Signed-off-by Jacek Anaszewski <[email protected]>Cc Dan Murphy <[email protected]>--- Documentation/devicetree/bindings/leds/leds-lm3692x.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)Documentation/devicetree/bindings/leds/leds-lm3692x.txt +5
-1@@ -26,12 +26,16 @@ Required child properties: 3 - Will enable the LED3 sync (LM36923 only) Optional child properties: - - label : see Documentation/devicetree/bindings/leds/common.txt + - function : see Documentation/devicetree/bindings/leds/common.txt + - color : see Documentation/devicetree/bindings/leds/common.txt + - label : see Documentation/devicetree/bindings/leds/common.txt (deprecated) - linux,default-trigger : see Documentation/devicetree/bindings/leds/common.txt Example: +#include <dt-bindings/leds/common.h> + led-controller@36 { compatible = "ti,lm3692x"; reg = <0x36>;
Documentation/devicetree/bindings/leds/leds-lm3692x.txt led-controller@36 { · line 54
Quoted 9 lines
Documentation/devicetree/bindings/leds/leds-lm3692x.txt +2
-1@@ -43,7 +47,8 @@ led-controller@36 { led@0 { reg = <0>; - label = "white:backlight_cluster"; + function = LED_FUNCTION_BACKLIGHT; + color = <LED_COLOR_ID_WHITE>; linux,default-trigger = "backlight"; }; }
Signature · 2 lines
------------------ Dan Murphy
PATCH v3 13/25 leds: lm3692x: Use generic support for composing LED names
In reply to Jacek AnaszewskiSwitch to using generic LED support for composing LED class device name.
At this occassion remove initialization of struct led_classdev's dev->of_node property in the driver, since now it will be taken from fwnode assigned to struct led_init_data and passed to the new devm_led_classdev_register_ext() API.
--- drivers/leds/leds-lm3692x.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-)
drivers/leds/leds-lm3692x.c +6 -16
@@ -13,7 +13,6 @@#include <linux/regmap.h> #include <linux/regulator/consumer.h> #include <linux/slab.h> -#include <uapi/linux/uleds.h> #define LM36922_MODEL 0#define LM36923_MODEL 1
@@ -103,7 +102,6 @@* @regmap - Devices register map * @enable_gpio - VDDIO/EN gpio to enable communication interface * @regulator - LED supply regulator pointer -* @label - LED label * @led_enable - LED sync to be enabled * @model_id - Current device model ID enumerated */
@@ -114,7 +112,6 @@ struct lm3692x_led {struct regmap *regmap;struct gpio_desc *enable_gpio;struct regulator *regulator; -char label[LED_MAX_NAME_SIZE ];int led_enable;int model_id; };
@@ -325,7 +322,7 @@ static int lm3692x_init(struct lm3692x_led *led)static int lm3692x_probe_dt (struct lm3692x_led *led) {struct fwnode_handle *child =NULL ; -const char *name; +struct led_init_data init_data;int ret; led->enable_gpio = devm_gpiod_get_optional(&led->client->dev,
@@ -350,30 +347,23 @@ static int lm3692x_probe_dt(struct lm3692x_led *led)fwnode_property_read_string (child,"linux,default-trigger" , &led->led_dev.default_trigger); - ret =fwnode_property_read_string (child,"label" , &name); -if (ret) -snprintf (led->label,sizeof (led->label), -"%s::" , led->client->name); -else -snprintf (led->label,sizeof (led->label), -"%s:%s" , led->client->name, name); - ret =fwnode_property_read_u32 (child,"reg" , &led->led_enable);if (ret) {dev_err (&led->client->dev,"reg DT property missing\n" );return ret; } - led->led_dev.name = led->label; + init_data.fwnode = child; + init_data.led_hw_name = led->client->name; + init_data.default_label =":" ; - ret =devm_led_classdev_register (&led->client->dev, &led->led_dev); + ret =devm_led_classdev_register_ext (&led->client->dev, &led->led_dev, + &init_data);if (ret) {dev_err (&led->client->dev,"led register err: %d\n" , ret);return ret; } - led->led_dev.dev->of_node =to_of_node (child); -return 0 ; }
Signature · 1 line
2.11.0
Re: [PATCH v3 13/25] leds: lm3692x: Use generic support for composing LED names
Jacek
Quoted 77 lines · Jacek Anaszewski
Switch to using generic LED support for composing LED class device name.
At this occassion remove initialization of struct led_classdev's
dev->of_nodeproperty in the driver, since now it will be taken from fwnode assigned to structled_init_dataand passed to the newdevm_led_classdev_register_ext()API.Signed-off-by Jacek Anaszewski <[email protected]>Cc Dan Murphy <[email protected]>--- drivers/leds/leds-lm3692x.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-)drivers/leds/leds-lm3692x.c +6
-14@@ -13,7 +13,6 @@#include <linux/regmap.h> #include <linux/regulator/consumer.h> #include <linux/slab.h> -#include <uapi/linux/uleds.h> #define LM36922_MODEL 0#define LM36923_MODEL 1@@ -103,7 +102,6 @@* @regmap - Devices register map * @enable_gpio - VDDIO/EN gpio to enable communication interface * @regulator - LED supply regulator pointer -* @label - LED label * @led_enable - LED sync to be enabled * @model_id - Current device model ID enumerated */ @@ -114,7 +112,6 @@ struct lm3692x_led {struct regmap *regmap;struct gpio_desc *enable_gpio;struct regulator *regulator; -char label[LED_MAX_NAME_SIZE ];int led_enable;int model_id; };@@ -325,7 +322,7 @@ static int lm3692x_init(struct lm3692x_led *led)static int lm3692x_probe_dt (struct lm3692x_led *led) {struct fwnode_handle *child =NULL ; -const char *name; +struct led_init_data init_data;int ret; led->enable_gpio = devm_gpiod_get_optional(&led->client->dev,@@ -350,30 +347,23 @@ static int lm3692x_probe_dt(struct lm3692x_led *led)fwnode_property_read_string (child,"linux,default-trigger" , &led->led_dev.default_trigger); - ret =fwnode_property_read_string (child,"label" , &name); -if (ret) -snprintf (led->label,sizeof (led->label), -"%s::" , led->client->name); -else -snprintf (led->label,sizeof (led->label), -"%s:%s" , led->client->name, name); - ret =fwnode_property_read_u32 (child,"reg" , &led->led_enable);if (ret) {dev_err (&led->client->dev,"reg DT property missing\n" );return ret; } - led->led_dev.name = led->label; + init_data.fwnode = child; + init_data.led_hw_name = led->client->name; + init_data.default_label =":" ; - ret =devm_led_classdev_register (&led->client->dev, &led->led_dev); + ret =devm_led_classdev_register_ext (&led->client->dev, &led->led_dev, + &init_data);
drivers/leds/leds-lm3692x.c static int lm3692x_probe_dt(struct lm3692x_led *led) · line 369
Quoted 10 lines
drivers/leds/leds-lm3692x.c +0
-2if (ret) {dev_err (&led->client->dev,"led register err: %d\n" , ret);return ret; } - led->led_dev.dev->of_node =to_of_node (child); -return 0 ; }
PATCH v3 14/25 dt-bindings: lm36010: Add function and color properties
In reply to Jacek AnaszewskiRefer to new "function" and "color" properties and mark "label" as deprecated.
--- Documentation/devicetree/bindings/leds/leds-lm3601x.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/leds/leds-lm3601x.txt +8 -2
@@ -22,9 +22,14 @@ Required properties for flash LED child nodes: - led-max-microamp : Range from 2.4mA - 376mA Optional child properties: - - label : see Documentation/devicetree/bindings/leds/common.txt + - function : see Documentation/devicetree/bindings/leds/common.txt + - color : see Documentation/devicetree/bindings/leds/common.txt + - label : see Documentation/devicetree/bindings/leds/common.txt (deprecated) Example: + +#include <dt-bindings/leds/common.h> + led-controller@64 { compatible = "ti,lm36010"; #address-cells = <1>;
@@ -33,7 +38,8 @@ led-controller@64 { led@0 { reg = <1>; - label = "white:torch"; + function = LED_FUNCTION_TORCH; + color = <LED_COLOR_ID_WHITE>; led-max-microamp = <376000>; flash-max-microamp = <1500000>; flash-max-timeout-us = <1600000>;
Signature · 1 line
2.11.0
Re: [PATCH v3 14/25] dt-bindings: lm36010: Add function and color properties
Jacek
Quoted 31 lines · Jacek Anaszewski
Refer to new "function" and "color" properties and mark "label" as deprecated.
Signed-off-by Jacek Anaszewski <[email protected]>Cc Dan Murphy <[email protected]>--- Documentation/devicetree/bindings/leds/leds-lm3601x.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)Documentation/devicetree/bindings/leds/leds-lm3601x.txt +6
-1@@ -22,9 +22,14 @@ Required properties for flash LED child nodes: - led-max-microamp : Range from 2.4mA - 376mA Optional child properties: - - label : see Documentation/devicetree/bindings/leds/common.txt + - function : see Documentation/devicetree/bindings/leds/common.txt + - color : see Documentation/devicetree/bindings/leds/common.txt + - label : see Documentation/devicetree/bindings/leds/common.txt (deprecated) Example: + +#include <dt-bindings/leds/common.h> + led-controller@64 { compatible = "ti,lm36010"; #address-cells = <1>;
Documentation/devicetree/bindings/leds/leds-lm3601x.txt led-controller@64 { · line 45
Quoted 9 lines
Documentation/devicetree/bindings/leds/leds-lm3601x.txt +2
-1@@ -33,7 +38,8 @@ led-controller@64 { led@0 { reg = <1>; - label = "white:torch"; + function = LED_FUNCTION_TORCH; + color = <LED_COLOR_ID_WHITE>; led-max-microamp = <376000>; flash-max-microamp = <1500000>; flash-max-timeout-us = <1600000>;
Signature · 2 lines
------------------ Dan Murphy
PATCH v3 15/25 leds: lm3601x: Use generic support for composing LED names
In reply to Jacek AnaszewskiSwitch to using generic LED support for composing LED class device name.
--- drivers/leds/leds-lm3601x.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-)
drivers/leds/leds-lm3601x.c +17 -21
@@ -10,7 +10,6 @@#include <linux/module.h> #include <linux/regmap.h> #include <linux/slab.h> -#include <uapi/linux/uleds.h> #define LM3601X_LED_IR 0x0#define LM3601X_LED_TORCH 0x1
@@ -90,8 +89,6 @@ struct lm3601x_led {struct regmap *regmap;struct mutex lock; -char led_name[LED_MAX_NAME_SIZE ]; -unsigned int flash_timeout;unsigned int last_flag;
@@ -322,10 +319,12 @@ static const struct led_flash_ops flash_ops = { .fault_get = lm3601x_flash_fault_get, }; -static int lm3601x_register_leds (struct lm3601x_led *led) +static int lm3601x_register_leds (struct lm3601x_led *led, +struct fwnode_handle *fwnode) {struct led_classdev *led_cdev;struct led_flash_setting *setting; +struct led_init_data init_data; led->fled_cdev.ops = &flash_ops;
@@ -342,20 +341,25 @@ static int lm3601x_register_leds(struct lm3601x_led *led) setting->val = led->flash_current_max; led_cdev = &led->fled_cdev.led_cdev; - led_cdev->name = led->led_name; led_cdev->brightness_set_blocking = lm3601x_brightness_set; led_cdev->max_brightness =DIV_ROUND_UP (led->torch_current_max,LM3601X_TORCH_REG_DIV ); led_cdev->flags |=LED_DEV_CAP_FLASH ; -return led_classdev_flash_register (&led->client->dev, &led->fled_cdev); + init_data.fwnode = fwnode; + init_data.led_hw_name = led->client->name; + init_data.default_label = (led->led_mode ==LM3601X_LED_TORCH ) ? +"torch" :"infrared" ; + +return led_classdev_flash_register_ext (&led->client->dev, + &led->fled_cdev, &init_data); } -static int lm3601x_parse_node (struct lm3601x_led *led) +static int lm3601x_parse_node (struct lm3601x_led *led, +struct fwnode_handle **fwnode) {struct fwnode_handle *child =NULL ;int ret = -ENODEV ; -const char *name; child =device_get_next_child_node (&led->client->dev, child);if (!child) {
@@ -376,17 +380,6 @@ static int lm3601x_parse_node(struct lm3601x_led *led) goto out_err; } - ret =fwnode_property_read_string (child,"label" , &name); -if (ret) { -if (led->led_mode ==LM3601X_LED_TORCH ) - name ="torch" ; -else - name ="infrared" ; - } - -snprintf (led->led_name,sizeof (led->led_name), -"%s:%s" , led->client->name, name); - ret =fwnode_property_read_u32 (child,"led-max-microamp" , &led->torch_current_max);if (ret) {
@@ -411,6 +404,8 @@ static int lm3601x_parse_node(struct lm3601x_led *led) goto out_err; } + *fwnode = child; + out_err:fwnode_handle_put (child);return ret;
@@ -419,6 +414,7 @@ static int lm3601x_parse_node(struct lm3601x_led *led)static int lm3601x_probe (struct i2c_client *client) {struct lm3601x_led *led; +struct fwnode_handle *fwnode;int ret; led =devm_kzalloc (&client->dev,sizeof (*led),GFP_KERNEL );
@@ -428,7 +424,7 @@ static int lm3601x_probe(struct i2c_client *client) led->client = client;i2c_set_clientdata (client, led); - ret =lm3601x_parse_node (led); + ret =lm3601x_parse_node (led, &fwnode);if (ret)return -ENODEV ;
@@ -442,7 +438,7 @@ static int lm3601x_probe(struct i2c_client *client)mutex_init (&led->lock); -return lm3601x_register_leds (led); +return lm3601x_register_leds (led, fwnode); }static int lm3601x_remove (struct i2c_client *client)
Signature · 1 line
2.11.0
Re: [PATCH v3 15/25] leds: lm3601x: Use generic support for composing LED names
Jacek
Quoted 119 lines · Jacek Anaszewski
Switch to using generic LED support for composing LED class device name.
Signed-off-by Jacek Anaszewski <[email protected]>Cc Dan Murphy <[email protected]>--- drivers/leds/leds-lm3601x.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-)drivers/leds/leds-lm3601x.c +16
-20@@ -10,7 +10,6 @@#include <linux/module.h> #include <linux/regmap.h> #include <linux/slab.h> -#include <uapi/linux/uleds.h> #define LM3601X_LED_IR 0x0#define LM3601X_LED_TORCH 0x1@@ -90,8 +89,6 @@ struct lm3601x_led {struct regmap *regmap;struct mutex lock; -char led_name[LED_MAX_NAME_SIZE ]; -unsigned int flash_timeout;unsigned int last_flag;@@ -322,10 +319,12 @@ static const struct led_flash_ops flash_ops = { .fault_get = lm3601x_flash_fault_get, }; -static int lm3601x_register_leds (struct lm3601x_led *led) +static int lm3601x_register_leds (struct lm3601x_led *led, +struct fwnode_handle *fwnode) {struct led_classdev *led_cdev;struct led_flash_setting *setting; +struct led_init_data init_data; led->fled_cdev.ops = &flash_ops;@@ -342,20 +341,25 @@ static int lm3601x_register_leds(struct lm3601x_led *led) setting->val = led->flash_current_max; led_cdev = &led->fled_cdev.led_cdev; - led_cdev->name = led->led_name; led_cdev->brightness_set_blocking = lm3601x_brightness_set; led_cdev->max_brightness =DIV_ROUND_UP (led->torch_current_max,LM3601X_TORCH_REG_DIV ); led_cdev->flags |=LED_DEV_CAP_FLASH ; -return led_classdev_flash_register (&led->client->dev, &led->fled_cdev); + init_data.fwnode = fwnode; + init_data.led_hw_name = led->client->name; + init_data.default_label = (led->led_mode ==LM3601X_LED_TORCH ) ? +"torch" :"infrared" ; + +return led_classdev_flash_register_ext (&led->client->dev, + &led->fled_cdev, &init_data); } -static int lm3601x_parse_node (struct lm3601x_led *led) +static int lm3601x_parse_node (struct lm3601x_led *led, +struct fwnode_handle **fwnode) {struct fwnode_handle *child =NULL ;int ret = -ENODEV ; -const char *name; child =device_get_next_child_node (&led->client->dev, child);if (!child) {@@ -376,17 +380,6 @@ static int lm3601x_parse_node(struct lm3601x_led *led) goto out_err; } - ret =fwnode_property_read_string (child,"label" , &name); -if (ret) { -if (led->led_mode ==LM3601X_LED_TORCH ) - name ="torch" ; -else - name ="infrared" ; - } - -snprintf (led->led_name,sizeof (led->led_name), -"%s:%s" , led->client->name, name); - ret =fwnode_property_read_u32 (child,"led-max-microamp" , &led->torch_current_max);if (ret) {@@ -411,6 +404,8 @@ static int lm3601x_parse_node(struct lm3601x_led *led) goto out_err; } + *fwnode = child; + out_err:fwnode_handle_put (child);return ret;@@ -419,6 +414,7 @@ static int lm3601x_parse_node(struct lm3601x_led *led)static int lm3601x_probe (struct i2c_client *client) {struct lm3601x_led *led; +struct fwnode_handle *fwnode;int ret; led =devm_kzalloc (&client->dev,sizeof (*led),GFP_KERNEL );@@ -428,7 +424,7 @@ static int lm3601x_probe(struct i2c_client *client) led->client = client;i2c_set_clientdata (client, led); - ret =lm3601x_parse_node (led); + ret =lm3601x_parse_node (led, &fwnode);if (ret)return -ENODEV ;
drivers/leds/leds-lm3601x.c static int lm3601x_probe(struct i2c_client *client) · line 444
Quoted 8 lines
drivers/leds/leds-lm3601x.c +1
-1@@ -442,7 +438,7 @@ static int lm3601x_probe(struct i2c_client *client)mutex_init (&led->lock); -return lm3601x_register_leds (led); +return lm3601x_register_leds (led, fwnode); }static int lm3601x_remove (struct i2c_client *client)
PATCH v3 16/25 dt-bindings: cr0014114: Add function and color properties
In reply to Jacek AnaszewskiRefer to new "function" and "color" properties and mark "label" as deprecated.
--- .../devicetree/bindings/leds/leds-cr0014114.txt | 26 ++++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-)
Documentation/devicetree/bindings/leds/leds-cr0014114.txt +19 -7
@@ -11,14 +11,20 @@ Property rules described in Documentation/devicetree/bindings/spi/spi-bus.txt apply. In particular, "reg" and "spi-max-frequency" properties must be given. LED sub-node properties: -- label : +- function : + see Documentation/devicetree/bindings/leds/common.txt +- color : see Documentation/devicetree/bindings/leds/common.txt +- label : + see Documentation/devicetree/bindings/leds/common.txt (deprecated) - linux,default-trigger : (optional) see Documentation/devicetree/bindings/leds/common.txt Example ------- +#include <dt-bindings/leds/common.h> + led-controller@0 { compatible = "crane,cr0014114"; reg = <0>;
@@ -28,27 +34,33 @@ led-controller@0 { led@0 { reg = <0>; - label = "red:coin"; + function = "coin"; + color = <LED_COLOR_ID_RED>; }; led@1 { reg = <1>; - label = "green:coin"; + function = "coin"; + color = <LED_COLOR_ID_GREEN>; }; led@2 { reg = <2>; - label = "blue:coin"; + function = "coin"; + color = <LED_COLOR_ID_BLUE>; }; led@3 { reg = <3>; - label = "red:bill"; + function = "bill"; + color = <LED_COLOR_ID_RED>; }; led@4 { reg = <4>; - label = "green:bill"; + function = "bill"; + color = <LED_COLOR_ID_GREEN>; }; led@5 { reg = <5>; - label = "blue:bill"; + function = "bill"; + color = <LED_COLOR_ID_BLUE>; }; ... };
Signature · 1 line
2.11.0
PATCH v3 17/25 leds: cr0014114: Use generic support for composing LED names
In reply to Jacek AnaszewskiSwitch to using generic LED support for composing LED class device name.
At this occassion remove initialization of struct led_classdev's dev->of_node property in the driver, since now it will be taken from fwnode assigned to struct led_init_data and passed to the new devm_led_classdev_register_ext() API.
--- drivers/leds/leds-cr0014114.c | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-)
drivers/leds/leds-cr0014114.c +11 -21
@@ -8,7 +8,6 @@#include <linux/of_device.h> #include <linux/spi/spi.h> #include <linux/workqueue.h> -#include <uapi/linux/uleds.h> /* * CR0014114 SPI protocol descrtiption:
@@ -40,8 +39,9 @@#define CR_FW_DELAY_MSEC 10#define CR_RECOUNT_DELAY (HZ * 3600) +#define CR_DEV_NAME "cr0014114" +struct cr0014114_led { -char name[LED_MAX_NAME_SIZE ];struct cr0014114 *priv;struct led_classdev ldev;u8 brightness;
@@ -167,8 +167,7 @@ static int cr0014114_set_sync(struct led_classdev *ldev, struct cr0014114_led, ldev); -dev_dbg (led->priv->dev,"Set brightness of %s to %d\n" , - led->name, brightness); +dev_dbg (led->priv->dev,"Set brightness to %d\n" , brightness);mutex_lock (&led->priv->lock); led->brightness = (u8 )brightness;
@@ -183,41 +182,32 @@ static int cr0014114_probe_dt(struct cr0014114 *priv)size_t i =0 ;struct cr0014114_led *led;struct fwnode_handle *child; -struct device_node *np; +struct led_init_data init_data;int ret; -const char *str;device_for_each_child_node (priv->dev, child) { - np =to_of_node (child); led = &priv->leds[i]; - ret =fwnode_property_read_string (child,"label" , &str); -if (ret) -snprintf (led->name,sizeof (led->name), -"cr0014114::" ); -else -snprintf (led->name,sizeof (led->name), -"cr0014114:%s" , str); -fwnode_property_read_string (child,"linux,default-trigger" , &led->ldev.default_trigger); led->priv = priv; - led->ldev.name = led->name; led->ldev.max_brightness =CR_MAX_BRIGHTNESS ; led->ldev.brightness_set_blocking = cr0014114_set_sync; - ret =devm_led_classdev_register (priv->dev, &led->ldev); + init_data.fwnode = child; + init_data.led_hw_name =CR_DEV_NAME ; + init_data.default_label =":" ; + + ret =devm_led_classdev_register_ext (priv->dev, &led->ldev, + &init_data);if (ret) {dev_err (priv->dev, -"failed to register LED device %s, err %d" , - led->name, ret); +"failed to register LED device, err %d" , ret);fwnode_handle_put (child);return ret; } - led->ldev.dev->of_node = np; - i++; }
Signature · 1 line
2.11.0
PATCH v3 18/25 dt-bindings: aat1290: Add function and color properties
In reply to Jacek AnaszewskiRefer to new "function" and "color" properties and mark "label" as deprecated.
--- Documentation/devicetree/bindings/leds/leds-aat1290.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/leds/leds-aat1290.txt +8 -4
@@ -32,15 +32,18 @@ Required properties of the LED child node: formula: T = 8.82 * 10^9 * Ct. Optional properties of the LED child node: -- label : see Documentation/devicetree/bindings/leds/common.txt +- function : see Documentation/devicetree/bindings/leds/common.txt +- color : see Documentation/devicetree/bindings/leds/common.txt +- label : see Documentation/devicetree/bindings/leds/common.txt (deprecated) Example (by Ct = 220nF, Rset = 160kohm and exynos4412-trats2 board with a switch that allows for routing strobe signal either from the host or from the camera sensor): #include "exynos4412.dtsi" +#include <dt-bindings/leds/common.h> -aat1290 { +led-controller { compatible = "skyworks,aat1290"; flen-gpios = <&gpj1 1 GPIO_ACTIVE_HIGH>; enset-gpios = <&gpj1 2 GPIO_ACTIVE_HIGH>;
@@ -50,8 +53,9 @@ aat1290 { pinctrl-1 = <&camera_flash_host>; pinctrl-2 = <&camera_flash_isp>; - camera_flash: flash-led { - label = "aat1290-flash"; + camera_flash: led { + function = LED_FUNCTION_FLASH; + color = <LED_COLOR_ID_WHITE>; led-max-microamp = <520833>; flash-max-microamp = <1012500>; flash-max-timeout-us = <1940000>;
Signature · 1 line
2.11.0
PATCH v3 19/25 leds: aat1290: Use generic support for composing LED names
In reply to Jacek AnaszewskiSwitch to using generic LED support for composing LED class device name.
--- drivers/leds/leds-aat1290.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/leds/leds-aat1290.c +8 -6
@@ -45,6 +45,8 @@#define AAT1290_FLASH_TM_NUM_LEVELS 16#define AAT1290_MM_CURRENT_SCALE_SIZE 15 +#define AAT1290_NAME "aat1290" +struct aat1290_led_config_data {/* maximum LED current in movie mode */
@@ -78,7 +80,6 @@ struct aat1290_led {int *mm_current_scale;/* device mode */ bool movie_mode; -/* brightness cache */ unsigned int torch_brightness; };
@@ -218,7 +219,6 @@ static int aat1290_led_parse_dt(struct aat1290_led *led,struct aat1290_led_config_data *cfg, struct device_node **sub_node) { - struct led_classdev *led_cdev = &led->fled_cdev.led_cdev; struct device *dev = &led->pdev->dev;struct device_node *child_node;#if IS_ENABLED (CONFIG_V4L2_FLASH_LED_CLASS )
@@ -257,9 +257,6 @@ static int aat1290_led_parse_dt(struct aat1290_led *led,return -EINVAL ; } - led_cdev->name =of_get_property (child_node,"label" ,NULL ) ? : - child_node->name; - ret =of_property_read_u32 (child_node,"led-max-microamp" , &cfg->max_mm_current);/*
@@ -469,6 +466,7 @@ static int aat1290_led_probe(struct platform_device *pdev)struct aat1290_led *led;struct led_classdev *led_cdev;struct led_classdev_flash *fled_cdev; +struct led_init_data init_data = {};struct aat1290_led_config_data led_cfg = {};struct v4l2_flash_config v4l2_sd_cfg = {};int ret;
@@ -497,8 +495,12 @@ static int aat1290_led_probe(struct platform_device *pdev)aat1290_init_flash_timeout (led, &led_cfg); + init_data.fwnode =of_fwnode_handle (sub_node); + init_data.led_hw_name =AAT1290_NAME ; +/* Register LED Flash class device */ - ret =led_classdev_flash_register (&pdev->dev, fled_cdev); + ret =led_classdev_flash_register_ext (&pdev->dev, fled_cdev, + &init_data);if (ret <0 ) goto err_flash_register;
Signature · 1 line
2.11.0
PATCH v3 20/25 dt-bindings: as3645a: Add function and color properties
In reply to Jacek AnaszewskiRefer to new "function" and "color" properties and mark "label" as deprecated.
Also, fix malformed syntax of address-cells and size-cells in the example.
--- .../devicetree/bindings/leds/ams,as3645a.txt | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
Documentation/devicetree/bindings/leds/ams,as3645a.txt +14 -8
@@ -39,7 +39,9 @@ ams,input-max-microamp: Maximum flash controller input current. The Optional properties of the flash child node =========================================== -label : The label of the flash LED. +function : See Documentation/devicetree/bindings/leds/common.txt. +color : See Documentation/devicetree/bindings/leds/common.txt. +label : See Documentation/devicetree/bindings/leds/common.txt (deprecated). Required properties of the indicator child node (1)
@@ -52,28 +54,32 @@ led-max-microamp: Maximum indicator current. The allowed values are Optional properties of the indicator child node =============================================== -label : The label of the indicator LED. +function : See Documentation/devicetree/bindings/leds/common.txt. +color : See Documentation/devicetree/bindings/leds/common.txt. +label : See Documentation/devicetree/bindings/leds/common.txt (deprecated). Example ======= +#include <dt-bindings/leds/common.h> + as3645a@30 { - #address-cells: 1 - #size-cells: 0 + #address-cells = <1>; + #size-cells = <0>; reg = <0x30>; compatible = "ams,as3645a"; - flash@0 { + led@0 { reg = <0x0>; flash-timeout-us = <150000>; flash-max-microamp = <320000>; led-max-microamp = <60000>; ams,input-max-microamp = <1750000>; - label = "as3645a:flash"; + function = LED_FUNCTION_FLASH; }; - indicator@1 { + led@1 { reg = <0x1>; led-max-microamp = <10000>; - label = "as3645a:indicator"; + function = LED_FUNCTION_INDICATOR; }; };
Signature · 1 line
2.11.0
PATCH v3 21/25 leds: as3645a: Use generic support for composing LED names
In reply to Jacek AnaszewskiSwitch to using generic LED support for composing LED class device name.
--- drivers/leds/leds-as3645a.c | 69 ++++++++++++++++----------------------------- 1 file changed, 25 insertions(+), 44 deletions(-)
drivers/leds/leds-as3645a.c +25 -44
@@ -132,11 +132,6 @@ struct as3645a_config {u32 peak; }; -struct as3645a_names { -char flash[32 ]; -char indicator[32 ]; -}; -struct as3645a {struct i2c_client *client;
@@ -492,12 +487,10 @@ static int as3645a_detect(struct as3645a *flash) }static int as3645a_parse_node (struct as3645a *flash, -struct as3645a_names *names,struct fwnode_handle *fwnode) {struct as3645a_config *cfg = &flash->cfg;struct fwnode_handle *child; -const char *name;int rval;fwnode_for_each_child_node (fwnode, child) {
@@ -525,17 +518,6 @@ static int as3645a_parse_node(struct as3645a *flash,return -ENODEV ; } - rval =fwnode_property_read_string (flash->flash_node,"label" , &name); -if (!rval) { -strlcpy (names->flash, name,sizeof (names->flash)); - }else if (is_of_node (fwnode)) { -snprintf (names->flash,sizeof (names->flash), -"%pOFn:flash" ,to_of_node (fwnode)); - }else { -dev_err (&flash->client->dev,"flash node has no label!\n" ); -return -EINVAL ; - } - rval =fwnode_property_read_u32 (flash->flash_node,"flash-timeout-us" , &cfg->flash_timeout_us);if (rval <0 ) {
@@ -573,17 +555,6 @@ static int as3645a_parse_node(struct as3645a *flash, goto out_err; } - rval =fwnode_property_read_string (flash->indicator_node,"label" , - &name); -if (!rval) { -strlcpy (names->indicator, name,sizeof (names->indicator)); - }else if (is_of_node (fwnode)) { -snprintf (names->indicator,sizeof (names->indicator), -"%pOFn:indicator" ,to_of_node (fwnode)); - }else { -dev_err (&flash->client->dev,"indicator node has no label!\n" ); -return -EINVAL ; - } rval = fwnode_property_read_u32(flash->indicator_node, "led-max-microamp",
@@ -603,21 +574,25 @@ static int as3645a_parse_node(struct as3645a *flash,return rval; } -static int as3645a_led_class_setup (struct as3645a *flash, -struct as3645a_names *names) +static int as3645a_led_class_setup (struct as3645a *flash) {struct led_classdev *fled_cdev = &flash->fled.led_cdev;struct led_classdev *iled_cdev = &flash->iled_cdev; +struct led_init_data init_data;struct led_flash_setting *cfg;int rval; - iled_cdev->name = names->indicator; iled_cdev->brightness_set_blocking = as3645a_set_indicator_brightness; iled_cdev->max_brightness = flash->cfg.indicator_max_ua /AS_INDICATOR_INTENSITY_STEP ; iled_cdev->flags =LED_CORE_SUSPENDRESUME ; - rval =led_classdev_register (&flash->client->dev, iled_cdev); + init_data.fwnode = flash->indicator_node; + init_data.led_hw_name =AS_NAME ; + init_data.default_label ="indicator" ; + + rval =led_classdev_register_ext (&flash->client->dev, iled_cdev, + &init_data);if (rval <0 )return rval;
@@ -635,7 +610,6 @@ static int as3645a_led_class_setup(struct as3645a *flash, flash->fled.ops = &as3645a_led_flash_ops; - fled_cdev->name = names->flash; fled_cdev->brightness_set_blocking = as3645a_set_assist_brightness;/* Value 0 is off in LED class. */ fled_cdev->max_brightness =
@@ -643,15 +617,23 @@ static int as3645a_led_class_setup(struct as3645a *flash, flash->cfg.assist_max_ua) + 1; fled_cdev->flags =LED_DEV_CAP_FLASH |LED_CORE_SUSPENDRESUME ; - rval =led_classdev_flash_register (&flash->client->dev, &flash->fled); -if (rval) { -led_classdev_unregister (iled_cdev); -dev_err (&flash->client->dev, -"led_classdev_flash_register() failed, error %d\n" , - rval); - } + init_data.fwnode = flash->flash_node; + init_data.led_hw_name =AS_NAME ; + init_data.default_label ="flash" ; + + rval =led_classdev_flash_register_ext (&flash->client->dev, + &flash->fled, &init_data); +if (rval) + goto out_err;return rval; + +out_err: +led_classdev_unregister (iled_cdev); +dev_err (&flash->client->dev, +"led_classdev_flash_register() failed, error %d\n" , + rval); +return rval; }static int as3645a_v4l2_setup (struct as3645a *flash)
@@ -697,7 +679,6 @@ static int as3645a_v4l2_setup(struct as3645a *flash)static int as3645a_probe (struct i2c_client *client) { -struct as3645a_names names;struct as3645a *flash;int rval;
@@ -710,7 +691,7 @@ static int as3645a_probe(struct i2c_client *client) flash->client = client; - rval =as3645a_parse_node (flash, &names,dev_fwnode (&client->dev)); + rval =as3645a_parse_node (flash,dev_fwnode (&client->dev));if (rval <0 )return rval;
@@ -725,7 +706,7 @@ static int as3645a_probe(struct i2c_client *client)if (rval) goto out_mutex_destroy; - rval =as3645a_led_class_setup (flash, &names); + rval =as3645a_led_class_setup (flash);if (rval) goto out_mutex_destroy;
Signature · 1 line
2.11.0
PATCH v3 22/25 dt-bindings: leds-gpio: Add function and color properties
In reply to Jacek AnaszewskiRefer to new "function" and "color" properties and mark "label" as deprecated.
--- .../devicetree/bindings/leds/leds-gpio.txt | 23 +++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)
Documentation/devicetree/bindings/leds/leds-gpio.txt +16 -7
@@ -10,8 +10,12 @@ LED sub-node properties: - gpios : Should specify the LED's GPIO, see "gpios property" in Documentation/devicetree/bindings/gpio/gpio.txt. Active low LEDs should be indicated using flags in the GPIO specifier. -- label : (optional) +- function : (optional) + see Documentation/devicetree/bindings/leds/common.txt +- color : (optional) see Documentation/devicetree/bindings/leds/common.txt +- label : (optional) + see Documentation/devicetree/bindings/leds/common.txt (deprecated) - linux,default-trigger : (optional) see Documentation/devicetree/bindings/leds/common.txt - default-state: (optional) The initial state of the LED.
@@ -27,30 +31,34 @@ LED sub-node properties: Examples: #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/leds/common.h> leds { compatible = "gpio-leds"; - hdd { - label = "Disk Activity"; + led0 { gpios = <&mcu_pio 0 GPIO_ACTIVE_LOW>; linux,default-trigger = "disk-activity"; + function = LED_FUNCTION_DISK; }; - fault { + led1 { gpios = <&mcu_pio 1 GPIO_ACTIVE_HIGH>; /* Keep LED on if BIOS detected hardware fault */ default-state = "keep"; + function = LED_FUNCTION_FAULT; }; }; run-control { compatible = "gpio-leds"; - red { + led0 { gpios = <&mpc8572 6 GPIO_ACTIVE_HIGH>; + color = <LED_COLOR_ID_RED>; default-state = "off"; }; - green { + led1 { gpios = <&mpc8572 7 GPIO_ACTIVE_HIGH>; + color = <LED_COLOR_ID_GREEN>; default-state = "on"; }; };
@@ -58,9 +66,10 @@ run-control { leds { compatible = "gpio-leds"; - charger-led { + led0 { gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; linux,default-trigger = "max8903-charger-charging"; retain-state-suspended; + function = LED_FUNCTION_CHARGE; }; };
Signature · 1 line
2.11.0
PATCH v3 23/25 leds: gpio: Use generic support for composing LED names
In reply to Jacek AnaszewskiSwitch to using generic LED support for composing LED class device name.
--- drivers/leds/leds-gpio.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)
drivers/leds/leds-gpio.c +10 -13
@@ -77,11 +77,11 @@ static int gpio_blink_set(struct led_classdev *led_cdev,static int create_gpio_led (const struct gpio_led *template,struct gpio_led_data *led_dat,struct device *parent, -struct device_node *np,gpio_blink_set_t blink_set) +struct fwnode_handle *fwnode,gpio_blink_set_t blink_set) { +struct led_init_data init_data = {};int ret, state; - led_dat->cdev.name = template->name; led_dat->cdev.default_trigger = template->default_trigger; led_dat->can_sleep =gpiod_cansleep (led_dat->gpiod);if (!led_dat->can_sleep)
@@ -112,7 +112,13 @@ static int create_gpio_led(const struct gpio_led *template,if (ret <0 )return ret; -return devm_led_classdev_register (parent, &led_dat->cdev); +if (template->name) + led_dat->cdev.name = template->name; +else + init_data.fwnode = fwnode; + +return devm_led_classdev_register_ext (parent, &led_dat->cdev, + &init_data); }struct gpio_leds_priv {
@@ -145,15 +151,6 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev)struct gpio_led_data *led_dat = &priv->leds[priv->num_leds];struct gpio_led led = {};const char *state =NULL ; -struct device_node *np =to_of_node (child); - - ret =fwnode_property_read_string (child,"label" , &led.name); -if (ret &&IS_ENABLED (CONFIG_OF ) && np) - led.name = np->name; -if (!led.name) { -fwnode_handle_put (child); -return ERR_PTR (-EINVAL ); - } led.gpiod = devm_fwnode_get_gpiod_from_child(dev, NULL, child, GPIOD_ASIS,
@@ -185,7 +182,7 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev)if (fwnode_property_present (child,"panic-indicator" )) led.panic_indicator =1 ; - ret =create_gpio_led (&led, led_dat, dev, np,NULL ); + ret =create_gpio_led (&led, led_dat, dev, child,NULL );if (ret <0 ) {fwnode_handle_put (child);return ERR_PTR (ret);
Signature · 1 line
2.11.0
PATCH v3 24/25 dt-bindings: an30259a: Add function and color properties
In reply to Jacek AnaszewskiRefer to new "function" and "color" properties and mark "label" as deprecated.
--- .../devicetree/bindings/leds/leds-an30259a.txt | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
Documentation/devicetree/bindings/leds/leds-an30259a.txt +17 -5
@@ -15,10 +15,19 @@ Required sub-node properties: - reg: Pin that the LED is connected to. Must be 1, 2, or 3. Optional sub-node properties: - - label: see Documentation/devicetree/bindings/leds/common.txt - - linux,default-trigger: see Documentation/devicetree/bindings/leds/common.txt + - function : + see Documentation/devicetree/bindings/leds/common.txt + - color : + see Documentation/devicetree/bindings/leds/common.txt + - label : + see Documentation/devicetree/bindings/leds/common.txt (deprecated) + - linux,default-trigger : + see Documentation/devicetree/bindings/leds/common.txt Example: + +#include <dt-bindings/leds/common.h> + led-controller@30 { compatible = "panasonic,an30259a"; reg = <0x30>;
@@ -28,16 +37,19 @@ led-controller@30 { led@1 { reg = <1>; linux,default-trigger = "heartbeat"; - label = "red:indicator"; + function = LED_FUNCTION_INDICATOR; + color = <LED_COLOR_ID_RED>; }; led@2 { reg = <2>; - label = "green:indicator"; + function = LED_FUNCTION_INDICATOR; + color = <LED_COLOR_ID_GREEN>; }; led@3 { reg = <3>; - label = "blue:indicator"; + function = LED_FUNCTION_INDICATOR; + color = <LED_COLOR_ID_BLUE>; }; };
Signature · 1 line
2.11.0
PATCH v3 25/25 leds: an30259a: Use generic support for composing LED names
In reply to Jacek AnaszewskiSwitch to using generic LED support for composing LED class device name.
--- drivers/leds/leds-an30259a.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
drivers/leds/leds-an30259a.c +13 -12
@@ -13,7 +13,6 @@#include <linux/mutex.h> #include <linux/of.h> #include <linux/regmap.h> -#include <uapi/linux/uleds.h> #define AN30259A_MAX_LEDS 3
@@ -54,6 +53,8 @@#define AN30259A_BLINK_MAX_TIME 7500/* ms */ #define AN30259A_SLOPE_RESOLUTION 500/* ms */ +#define AN30259A_NAME "an30259a" +#define STATE_OFF 0#define STATE_KEEP 1#define STATE_ON 2
@@ -62,11 +63,11 @@ struct an30259a;struct an30259a_led {struct an30259a *chip; +struct fwnode_handle *fwnode;struct led_classdev cdev;u32 num;u32 default_state;bool sloping; -char label[LED_MAX_NAME_SIZE ]; };struct an30259a {
@@ -226,14 +227,7 @@ static int an30259a_dt_init(struct i2c_client *client, led->num = source; led->chip = chip; - -if (of_property_read_string (child,"label" , &str)) -snprintf (led->label,sizeof (led->label),"an30259a::" ); -else -snprintf (led->label,sizeof (led->label),"an30259a:%s" , - str); - - led->cdev.name = led->label; + led->fwnode =of_fwnode_handle (child);if (!of_property_read_string (child,"default-state" , &str)) {if (!strcmp (str,"on" ))
@@ -312,13 +306,20 @@ static int an30259a_probe(struct i2c_client *client) chip->regmap =devm_regmap_init_i2c (client, &an30259a_regmap_config);for (i =0 ; i < chip->num_leds; i++) { +struct led_init_data init_data; +an30259a_init_default_state (&chip->leds[i]); chip->leds[i].cdev.brightness_set_blocking = an30259a_brightness_set; chip->leds[i].cdev.blink_set = an30259a_blink_set; - err =devm_led_classdev_register (&client->dev, - &chip->leds[i].cdev); + init_data.fwnode = chip->leds[i].fwnode; + init_data.led_hw_name =AN30259A_NAME ; + init_data.default_label =":" ; + + err =devm_led_classdev_register_ext (&client->dev, + &chip->leds[i].cdev, + &init_data);if (err <0 ) goto exit; }
Signature · 1 line
2.11.0
Hi!
I have not yet gone through the series in great detail.
This will change the userland ABI, right? Now, I understand that old ABI is bad, but will it break someone's code?
Pavel
Hi Pavel,
Quoted 6 lines · Pavel Machek
Hi!
I have not yet gone through the series in great detail.
This will change the userland ABI, right? Now, I understand that old ABI is bad, but will it break someone's code?
It will not break anyone since the generic support for composing LED names is used only if struct init_data is provided. Otherwise led_cdev->name property is taken as is for the LED class device name.
Moreover, it is safe to switch many of existing DT (or fwnode in general) based drivers to using generic mechanism.
If the DT provides label property it will be concatenated with the led_hw_name provided by the driver. The problem would be only with the drivers whose bindings erroneously require devicename section in the label. They will need to be left intact.
Signature · 2 lines
Best regards, Jacek Anaszewski
Hi!
Quoted 9 lines
Quoted 4 lines
I have not yet gone through the series in great detail.
This will change the userland ABI, right? Now, I understand that old ABI is bad, but will it break someone's code?
It will not break anyone since the generic support for composing LED names is used only if struct
init_datais provided. Otherwiseled_cdev->nameproperty is taken as is for the LED class device name.
Quoted 6 lines
Moreover, it is safe to switch many of existing DT (or fwnode in general) based drivers to using generic mechanism.
If the DT provides label property it will be concatenated with theled_hw_nameprovided by the driver. The problem would be only with the drivers whose bindings erroneously require devicename section in the label. They will need to be left intact.
Ok. Plus it seems series causes some compile issues:
924 kbuild tes [j.anaszewski-leds:led_naming_v3 13/37]
drivers/leds/leds-pwm.c:117:8: error:
925 N kbuild tes [j.anaszewski-leds:led_naming_v3 17/37]
drivers/leds/led-core.o:undefined ref
926 N kbuild tes [j.anaszewski-leds:led_naming_v3 13/37]
drivers/leds/leds-pwm.c:117:44: spars
927 N kbuild tes [j.anaszewski-leds:led_naming_v3 13/37]
drivers/leds/leds-pwm.c:117:8: error:
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html