| Message ID | 20200114183442.45720-1-stephan@gerhold.net (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 996d5d5f89a558a3608a46e73ccd1b99f1b1d058 |
| Headers | show |
| Series | [v2] Input: pm8xxx-vib - fix handling of separate enable register | expand |
On Tue, Jan 14, 2020 at 07:34:42PM +0100, Stephan Gerhold wrote: > 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. > > Cc: Damien Riegel <damien.riegel@savoirfairelinux.com> > Fixes: d4c7c5c96c92 ("Input: pm8xxx-vib - handle separate enable register") > Signed-off-by: Stephan Gerhold <stephan@gerhold.net> Applied, thank you. > --- > 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(-) > > diff --git a/drivers/input/misc/pm8xxx-vibrator.c b/drivers/input/misc/pm8xxx-vibrator.c > index ecd762f93732..53ad25eaf1a2 100644 > --- a/drivers/input/misc/pm8xxx-vibrator.c > +++ b/drivers/input/misc/pm8xxx-vibrator.c > @@ -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; > } > -- > 2.24.1 >
diff --git a/drivers/input/misc/pm8xxx-vibrator.c b/drivers/input/misc/pm8xxx-vibrator.c index ecd762f93732..53ad25eaf1a2 100644 --- a/drivers/input/misc/pm8xxx-vibrator.c +++ b/drivers/input/misc/pm8xxx-vibrator.c @@ -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; }
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. Cc: Damien Riegel <damien.riegel@savoirfairelinux.com> Fixes: d4c7c5c96c92 ("Input: pm8xxx-vib - handle separate enable register") Signed-off-by: Stephan Gerhold <stephan@gerhold.net> --- 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(-)