Message ID | 20221129212901.1049085-1-luca@z3ntu.xyz |
---|---|
State | New |
Headers | show |
Series | leds: is31fl319x: Fix setting current limit for is31fl319{0,1,3} | expand |
On Tue 2022-11-29 22:29:01, Luca Weiss wrote: > The current setting lives in bits 4:2 (as also defined by the mask) but > the current limit defines in the driver use bits 2:0 which should be > shifted over so they don't get masked out completely (except for 17.5mA > which became 10mA). > > Now checking /sys/kernel/debug/regmap/1-0068/registers shows that the > current limit is applied correctly and doesn't take the default b000 = > 42mA. Thank you, applied. Best regards, Pavel
diff --git a/drivers/leds/leds-is31fl319x.c b/drivers/leds/leds-is31fl319x.c index 52b59b62f437..b2f4c4ec7c56 100644 --- a/drivers/leds/leds-is31fl319x.c +++ b/drivers/leds/leds-is31fl319x.c @@ -38,6 +38,7 @@ #define IS31FL3190_CURRENT_uA_MIN 5000 #define IS31FL3190_CURRENT_uA_DEFAULT 42000 #define IS31FL3190_CURRENT_uA_MAX 42000 +#define IS31FL3190_CURRENT_SHIFT 2 #define IS31FL3190_CURRENT_MASK GENMASK(4, 2) #define IS31FL3190_CURRENT_5_mA 0x02 #define IS31FL3190_CURRENT_10_mA 0x01 @@ -553,7 +554,7 @@ static int is31fl319x_probe(struct i2c_client *client) is31fl3196_db_to_gain(is31->audio_gain_db)); else regmap_update_bits(is31->regmap, IS31FL3190_CURRENT, IS31FL3190_CURRENT_MASK, - is31fl3190_microamp_to_cs(dev, aggregated_led_microamp)); + is31fl3190_microamp_to_cs(dev, aggregated_led_microamp) << IS31FL3190_CURRENT_SHIFT); for (i = 0; i < is31->cdef->num_leds; i++) { struct is31fl319x_led *led = &is31->leds[i];
The current setting lives in bits 4:2 (as also defined by the mask) but the current limit defines in the driver use bits 2:0 which should be shifted over so they don't get masked out completely (except for 17.5mA which became 10mA). Now checking /sys/kernel/debug/regmap/1-0068/registers shows that the current limit is applied correctly and doesn't take the default b000 = 42mA. Fixes: fa877cf1abb9 ("leds: is31fl319x: Add support for is31fl319{0,1,3} chips") Signed-off-by: Luca Weiss <luca@z3ntu.xyz> --- Cross-checked with SN3193 datasheet I found online and downstream driver, but please double check also against any info you have. The SN3193 is used on msm8974pro-oneplus-bacon and I will send a patch in the future to add it to the dts. drivers/leds/leds-is31fl319x.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)