* [PATCH v2] leds: lm3601x: Calculate max_brightness and brightness properly
@ 2024-07-04 19:15 Jack Chen
2024-07-25 7:37 ` (subset) " Lee Jones
0 siblings, 1 reply; 2+ messages in thread
From: Jack Chen @ 2024-07-04 19:15 UTC (permalink / raw)
To: Pavel Machek, Lee Jones
Cc: Mark Brown, Vadim Pasternak, Randy Dunlap, Jack Chen,
linux-kernel, linux-leds
The torch_current_max should be checked not exceeding the upper bound.
If it does, throw a warning message and set to LM3601X_MAX_TORCH_I_UA.
LM3601x torch brigthness register (LM3601X_LED_TORCH_REG) takes 0 as the
minimum output (2.4 mA). However, 0 of led_brightness means LED_OFF.
Adding a -1 offset to brightness before writing to brightness
register, so when users write minimum brightness (1), it sets lm3601x
output the minimum.
Signed-off-by: Jack Chen <zenghuchen@google.com>
---
drivers/leds/flash/leds-lm3601x.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/leds/flash/leds-lm3601x.c b/drivers/leds/flash/leds-lm3601x.c
index 7e93c447fec5..1a6b9ee9e582 100644
--- a/drivers/leds/flash/leds-lm3601x.c
+++ b/drivers/leds/flash/leds-lm3601x.c
@@ -190,7 +190,7 @@ static int lm3601x_brightness_set(struct led_classdev *cdev,
goto out;
}
- ret = regmap_write(led->regmap, LM3601X_LED_TORCH_REG, brightness);
+ ret = regmap_write(led->regmap, LM3601X_LED_TORCH_REG, brightness - 1);
if (ret < 0)
goto out;
@@ -341,8 +341,9 @@ static int lm3601x_register_leds(struct lm3601x_led *led,
led_cdev = &led->fled_cdev.led_cdev;
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->max_brightness =
+ DIV_ROUND_UP(led->torch_current_max - LM3601X_MIN_TORCH_I_UA + 1,
+ LM3601X_TORCH_REG_DIV);
led_cdev->flags |= LED_DEV_CAP_FLASH;
init_data.fwnode = fwnode;
@@ -386,6 +387,14 @@ static int lm3601x_parse_node(struct lm3601x_led *led,
goto out_err;
}
+ if (led->torch_current_max > LM3601X_MAX_TORCH_I_UA) {
+ dev_warn(&led->client->dev,
+ "Max torch current set too high (%d vs %d)\n",
+ led->torch_current_max,
+ LM3601X_MAX_TORCH_I_UA);
+ led->torch_current_max = LM3601X_MAX_TORCH_I_UA;
+ }
+
ret = fwnode_property_read_u32(child, "flash-max-microamp",
&led->flash_current_max);
if (ret) {
--
2.45.2.803.g4e1b14247a-goog
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: (subset) [PATCH v2] leds: lm3601x: Calculate max_brightness and brightness properly
2024-07-04 19:15 [PATCH v2] leds: lm3601x: Calculate max_brightness and brightness properly Jack Chen
@ 2024-07-25 7:37 ` Lee Jones
0 siblings, 0 replies; 2+ messages in thread
From: Lee Jones @ 2024-07-25 7:37 UTC (permalink / raw)
To: Pavel Machek, Lee Jones, Jack Chen
Cc: Mark Brown, Vadim Pasternak, Randy Dunlap, linux-kernel, linux-leds
On Thu, 04 Jul 2024 15:15:00 -0400, Jack Chen wrote:
> The torch_current_max should be checked not exceeding the upper bound.
> If it does, throw a warning message and set to LM3601X_MAX_TORCH_I_UA.
>
> LM3601x torch brigthness register (LM3601X_LED_TORCH_REG) takes 0 as the
> minimum output (2.4 mA). However, 0 of led_brightness means LED_OFF.
> Adding a -1 offset to brightness before writing to brightness
> register, so when users write minimum brightness (1), it sets lm3601x
> output the minimum.
>
> [...]
Applied, thanks!
[1/1] leds: lm3601x: Calculate max_brightness and brightness properly
commit: ef23c7b35efb9cfa0b56fbb7fdf3aa782b1c2b87
--
Lee Jones [李琼斯]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-07-25 7:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-07-04 19:15 [PATCH v2] leds: lm3601x: Calculate max_brightness and brightness properly Jack Chen
2024-07-25 7:37 ` (subset) " Lee Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®