video: leds: backlight: lm3533: Support getting LED sources from DT
Subsystems (3)
PATCH v2 1/1 video: leds: backlight: lm3533: Support getting LED sources from DT
Add Control Bank to HVLED/LVLED muxing support based on the led-sources defined in the device tree.
---
This was part of the original LM3533 controller DT/OF conversion patchset, but it appears to have been accidentally separated during the final iteration. Therefore, I am sending it as a follow-up.
Changes in v2:
- leds: switch to macros in regmap_update_bits() calls to apply 0xff mask since regmap writes may cause unwanted writing.
--- drivers/leds/leds-lm3533.c | 62 +++++++++++++++++++++++++++++ drivers/video/backlight/lm3533_bl.c | 45 +++++++++++++++++++++ 2 files changed, 107 insertions(+)
drivers/leds/leds-lm3533.c +62 -0
@@ -26,6 +26,13 @@#define LM3533_ALS_CHANNEL_LV_MIN 1#define LM3533_ALS_CHANNEL_LV_MAX 2 +#define LM3533_REG_OUTPUT_CONF1 0x10 +#define OUTPUT_CONF1_SHIFT 2 +#define OUTPUT_LVLED_MASK 0x3 +#define OUTPUT_CONF1_PREP (x) (((x) << OUTPUT_CONF1_SHIFT) && 0xff) +#define LM3533_REG_OUTPUT_CONF2 0x11 +#define OUTPUT_CONF2_SHIFT 6 +#define OUTPUT_CONF2_PREP (x) (((x) >> OUTPUT_CONF2_SHIFT) && 0xff)#define LM3533_REG_CTRLBANK_BCONF_BASE 0x1b#define LM3533_REG_PATTERN_ENABLE 0x28#define LM3533_REG_PATTERN_LOW_TIME_BASE 0x71
@@ -54,6 +61,9 @@ struct lm3533_led {u32 max_current;u32 pwm; +int num_leds; +u32 leds[LM3533_LVCTRLBANK_MAX ]; +bool have_als; };
@@ -622,8 +632,36 @@ static const struct attribute_group *lm3533_led_attribute_groups[] = {static int lm3533_led_setup (struct lm3533_led *led) { +u32 output_cfg_shift =0 ; +u32 output_cfg_val =0 ; +u32 output_cfg_mask =0 ;int ret; +if (led->num_leds) { +for (int i =0 ; i < led->num_leds; i++) { +if (led->leds[i] >=LM3533_LVCTRLBANK_MAX ) +continue ; + + output_cfg_shift = led->leds[i] *2 ; + output_cfg_val |= led->id << output_cfg_shift; + output_cfg_mask |=OUTPUT_LVLED_MASK << output_cfg_shift; + } + +/* LVLED1, LVLED2 and LVLED3 */ + ret =regmap_update_bits (led->regmap,LM3533_REG_OUTPUT_CONF1 , +OUTPUT_CONF1_PREP (output_cfg_mask), +OUTPUT_CONF1_PREP (output_cfg_val)); +if (ret) +return ret; + +/* LVLED4 and LVLED5 */ + ret =regmap_update_bits (led->regmap,LM3533_REG_OUTPUT_CONF2 , +OUTPUT_CONF2_PREP (output_cfg_mask), +OUTPUT_CONF2_PREP (output_cfg_val)); +if (ret) +return ret; + } + ret =lm3533_ctrlbank_set_max_current (&led->cb, led->max_current);if (ret)return ret;
@@ -698,6 +736,30 @@ static int lm3533_led_probe(struct platform_device *pdev)device_property_read_u32 (&pdev->dev,"ti,pwm-config-mask" , &led->pwm); +/* +* If led-sources property is not set then either this Control Bank uses +* its default LVLED or is not linked to any LVLED at all. +*/ + led->num_leds =device_property_count_u32 (&pdev->dev,"led-sources" ); +if (led->num_leds >LM3533_LVCTRLBANK_MAX ) { +dev_err (&pdev->dev,"num of LED sources exceeds max %d: %d\n" , +LM3533_LVCTRLBANK_MAX , led->num_leds); + ret = -EINVAL ; + goto err_deregister; + } + +if (led->num_leds <0 ) + led->num_leds =0 ; + +if (led->num_leds >0 ) { + ret =device_property_read_u32_array (&pdev->dev,"led-sources" , + led->leds, led->num_leds); +if (ret) { +dev_err (&pdev->dev,"failed to get led-sources\n" ); + goto err_deregister; + } + } + ret =lm3533_led_setup (led);if (ret) goto err_deregister;
drivers/video/backlight/lm3533_bl.c +45 -0
81 lines not on this page · raw message
Signature · 1 line
2.53.0
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 1 potential issue to consider: - [High] leds: lm3533: logical AND instead of bitwise AND in lm3533_led_setup() --
Thank you for your contribution! Sashiko AI review found 1 potential issue to consider:
- [High] leds: lm3533: logical AND instead of bitwise AND in lm3533_led_setup()
--
commit 2dcd9488633f844daaa29902962d2a0a3e964633
Author: Svyatoslav Ryhel <[email protected]>
video: leds: backlight: lm3533: Support getting LED sources from DT
This commit adds support for configuring LM3533 Control Bank to HVLED and LVLED output muxing from the led-sources Device Tree property.
Quoted 5 lines
drivers/leds/leds-lm3533.c +0
-0
drivers/leds/leds-lm3533.c line 35
Quoted 10 lines
drivers/leds/leds-lm3533.c +7
-0@@ -26,6 +26,13 @@#define LM3533_ALS_CHANNEL_LV_MIN 1#define LM3533_ALS_CHANNEL_LV_MAX 2 +#define LM3533_REG_OUTPUT_CONF1 0x10 +#define OUTPUT_CONF1_SHIFT 2 +#define OUTPUT_LVLED_MASK 0x3 +#define OUTPUT_CONF1_PREP (x) (((x) << OUTPUT_CONF1_SHIFT) && 0xff) +#define LM3533_REG_OUTPUT_CONF2 0x11 +#define OUTPUT_CONF2_SHIFT 6 +#define OUTPUT_CONF2_PREP (x) (((x) >> OUTPUT_CONF2_SHIFT) && 0xff)
[Severity: High]
Should OUTPUT_CONF1_PREP() and OUTPUT_CONF2_PREP() use bitwise AND (& 0xff) instead of logical AND (&& 0xff)?
With && 0xff, both macros evaluate to 0 or 1, so lm3533_led_setup() passes a mask of 0x01 to regmap_update_bits() on LM3533_REG_OUTPUT_CONF1 and LM3533_REG_OUTPUT_CONF2. That leaves LVLED1..LVLED5 unconfigured and overwrites bit 0 of LM3533_REG_OUTPUT_CONF1, which controls HVLED1 backlight muxing.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1