Message ID | 20200919053145.7564-3-post@lespocky.de |
---|---|
State | Superseded |
Headers | show |
Series | [v5,1/3] leds: pwm: Remove platform_data support | expand |
On Sat 2020-09-19 07:31:44, Alexander Dahl wrote: > 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. Thanks, applied. Pavel
diff --git a/drivers/leds/leds-pwm.c b/drivers/leds/leds-pwm.c index 4e9954f8f7eb..8881d465701d 100644 --- a/drivers/leds/leds-pwm.c +++ b/drivers/leds/leds-pwm.c @@ -61,6 +61,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; @@ -80,7 +81,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);
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> --- Notes: v4 -> v5: * updated commit message v3 -> v4: * simplified implementation based on a new change in led-core * removed Acked-by due to changed implementation v2 -> v3: * added Acked-by v1 -> v2: * no change to this patch drivers/leds/leds-pwm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)