Commit de73f275 authored Sep 19, 2020 by Alexander Dahl Committed by Pavel Machek Sep 26, 2020

leds: pwm: Allow automatic labels for DT based devices



If LEDs are configured through device tree and the property 'label' is
omitted, the label is supposed to be generated from the properties
'function' and 'color' if present.  While this works fine for e.g. the
'leds-gpio' driver, it did not for 'leds-pwm'.

The reason is, you get this label naming magic only if you add a LED
device through 'devm_led_classdev_register_ext()' and pass a pointer to
the current device tree node.

For the following node from dts the LED appeared as 'led-5' in sysfs
before and as 'red:debug' after this change.

        pwm_leds {
                compatible = "pwm-leds";

                led-5 {
                        function = LED_FUNCTION_DEBUG;
                        color = <LED_COLOR_ID_RED>;
                        pwms = <&pwm0 2 10000000 0>;
                        max-brightness = <127>;

                        linux,default-trigger = "heartbeat";
                        panic-indicator;
                };
        };

Signed-off-by: Alexander Dahl <post@lespocky.de>
Cc: Marek Behún <marek.behun@nic.cz>
Signed-off-by: Pavel Machek <pavel@ucw.cz>

parent 03eb2ca4

drivers/leds/leds-pwm.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@ static int led_pwm_add(struct device dev, struct led_pwm_priv priv,
		struct led_pwm led, struct fwnode_handle fwnode)
		{
		struct led_pwm_data *led_data = &priv->leds[priv->num_leds];
		struct led_init_data init_data = { .fwnode = fwnode };
		int ret;

		led_data->active_low = led->active_low;
		@@ -87,7 +88,7 @@ static int led_pwm_add(struct device dev, struct led_pwm_priv priv,

		pwm_init_state(led_data->pwm, &led_data->pwmstate);

		ret = devm_led_classdev_register(dev, &led_data->cdev);
		ret = devm_led_classdev_register_ext(dev, &led_data->cdev, &init_data);
		if (ret) {
		dev_err(dev, "failed to register PWM led for %s: %d\n",
		led->name, ret);

Admin message