Input: pm8xxx-vib - fix handling of separate enable register
Subsystems (3)
PATCH v2 1/1 Input: pm8xxx-vib - fix handling of separate enable register
Setting the vibrator enable_mask is not implemented correctly:
For regmap_update_bits(map, reg, mask, val) we give in either regs->enable_mask or 0 (= no-op) as mask and "val" as value. But "val" actually refers to the vibrator voltage control register, which has nothing to do with the enable_mask.
So we usually end up doing nothing when we really wanted to enable the vibrator.
We want to set or clear the enable_mask (to enable/disable the vibrator). Therefore, change the call to always modify the enable_mask and set the bits only if we want to enable the vibrator.
---
v1: https://patchwork.kernel.org/patch/11286073/
Changes in v2:
- Changed regmap_update_bits(..., regs->enable_mask, on ? regs->enable_mask : 0) to regmap_update_bits(..., regs->enable_mask, on ? ~0 : 0) (suggested by Dmitry Torokhov)
--- drivers/input/misc/pm8xxx-vibrator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/misc/pm8xxx-vibrator.c +1 -1
@@ -90,7 +90,7 @@ static int pm8xxx_vib_set(struct pm8xxx_vib *vib, bool on)if (regs->enable_mask) rc =regmap_update_bits (vib->regmap, regs->enable_addr, - on ? regs->enable_mask :0 , val); + regs->enable_mask, on ? ~0 :0 );return rc; }
Signature · 1 line
2.24.1
Quoted 10 lines · Stephan Gerhold
Setting the vibrator
enable_maskis not implemented correctly:For
regmap_update_bits(map, reg, mask, val)we give in eitherregs->enable_maskor 0 (= no-op) as mask and "val" as value. But "val" actually refers to the vibrator voltage control register, which has nothing to do with theenable_mask.So we usually end up doing nothing when we really wanted to enable the vibrator.
Quoted 7 lines
We want to set or clear the
enable_mask(to enable/disable the vibrator). Therefore, change the call to always modify theenable_maskand set the bits only if we want to enable the vibrator.Cc Damien Riegel <[email protected]>Fixes d4c7c5c96c92 ("Input: pm8xxx-vib - handle separate enable register")Signed-off-by Stephan Gerhold <[email protected]>
Applied, thank you.
Quoted 26 lines
---
v1: https://patchwork.kernel.org/patch/11286073/
Changes in v2:
- Changedregmap_update_bits(..., regs->enable_mask, on ? regs->enable_mask : 0)toregmap_update_bits(..., regs->enable_mask, on ? ~0 : 0)(suggested by Dmitry Torokhov)--- drivers/input/misc/pm8xxx-vibrator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/input/misc/pm8xxx-vibrator.c +1
-1@@ -90,7 +90,7 @@ static int pm8xxx_vib_set(struct pm8xxx_vib *vib, bool on)if (regs->enable_mask) rc =regmap_update_bits (vib->regmap, regs->enable_addr, - on ? regs->enable_mask :0 , val); + regs->enable_mask, on ? ~0 :0 );return rc; }Signature · 1 line
2.24.1
Signature · 1 line
Dmitry