| Message ID | 20240411-pm8xxx-vibrator-new-design-v9-1-7bf56cb92b28@quicinc.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add support for vibrator in multiple PMICs | expand |
On Thu, 11 Apr 2024 at 11:32, Fenglin Wu via B4 Relay <devnull+quic_fenglinw.quicinc.com@kernel.org> wrote: > > From: Fenglin Wu <quic_fenglinw@quicinc.com> > > The output voltage is inclusive hence the max level calculation is > off-by-one-step. Correct it. > > Signed-off-by: Fenglin Wu <quic_fenglinw@quicinc.com> > --- > drivers/input/misc/pm8xxx-vibrator.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) Fixes tag? > > diff --git a/drivers/input/misc/pm8xxx-vibrator.c b/drivers/input/misc/pm8xxx-vibrator.c > index 04cb87efd799..89f0f1c810d8 100644 > --- a/drivers/input/misc/pm8xxx-vibrator.c > +++ b/drivers/input/misc/pm8xxx-vibrator.c > @@ -14,7 +14,8 @@ > > #define VIB_MAX_LEVEL_mV (3100) > #define VIB_MIN_LEVEL_mV (1200) > -#define VIB_MAX_LEVELS (VIB_MAX_LEVEL_mV - VIB_MIN_LEVEL_mV) > +#define VIB_PER_STEP_mV (100) > +#define VIB_MAX_LEVELS (VIB_MAX_LEVEL_mV - VIB_MIN_LEVEL_mV + VIB_PER_STEP_mV) > > #define MAX_FF_SPEED 0xff > > @@ -118,10 +119,10 @@ static void pm8xxx_work_handler(struct work_struct *work) > vib->active = true; > vib->level = ((VIB_MAX_LEVELS * vib->speed) / MAX_FF_SPEED) + > VIB_MIN_LEVEL_mV; > - vib->level /= 100; > + vib->level /= VIB_PER_STEP_mV; > } else { > vib->active = false; > - vib->level = VIB_MIN_LEVEL_mV / 100; > + vib->level = VIB_MIN_LEVEL_mV / VIB_PER_STEP_mV; > } > > pm8xxx_vib_set(vib, vib->active); > > -- > 2.25.1 > >
diff --git a/drivers/input/misc/pm8xxx-vibrator.c b/drivers/input/misc/pm8xxx-vibrator.c index 04cb87efd799..89f0f1c810d8 100644 --- a/drivers/input/misc/pm8xxx-vibrator.c +++ b/drivers/input/misc/pm8xxx-vibrator.c @@ -14,7 +14,8 @@ #define VIB_MAX_LEVEL_mV (3100) #define VIB_MIN_LEVEL_mV (1200) -#define VIB_MAX_LEVELS (VIB_MAX_LEVEL_mV - VIB_MIN_LEVEL_mV) +#define VIB_PER_STEP_mV (100) +#define VIB_MAX_LEVELS (VIB_MAX_LEVEL_mV - VIB_MIN_LEVEL_mV + VIB_PER_STEP_mV) #define MAX_FF_SPEED 0xff @@ -118,10 +119,10 @@ static void pm8xxx_work_handler(struct work_struct *work) vib->active = true; vib->level = ((VIB_MAX_LEVELS * vib->speed) / MAX_FF_SPEED) + VIB_MIN_LEVEL_mV; - vib->level /= 100; + vib->level /= VIB_PER_STEP_mV; } else { vib->active = false; - vib->level = VIB_MIN_LEVEL_mV / 100; + vib->level = VIB_MIN_LEVEL_mV / VIB_PER_STEP_mV; } pm8xxx_vib_set(vib, vib->active);