xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Input: pm8xxx-vibrator - correct VIB_MAX_LEVELS calculation

Browse Source 
[ Upstream commit 48c0687a322d54ac7e7a685c0b6db78d78f593af ]

The output voltage is inclusive hence the max level calculation is
off-by-one-step. Correct it.

iWhile we are at it also add a define for the step size instead of
using the magic value.

Fixes: 11205bb63e ("Input: add support for pm8xxx based vibrator driver")
Signed-off-by: Fenglin Wu <quic_fenglinw@quicinc.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20240412-pm8xxx-vibrator-new-design-v10-1-0ec0ad133866@quicinc.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Fenglin Wu
2024-04-15 16:03:40 -07:00
committed by Greg Kroah-Hartman
parent 580e47c282
commit a3bb8070b7
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/input/misc/pm8xxx-vibrator.c
View File

@@ -14,7 +14,8 @@
#define VIB_MAX_LEVEL_mV (3100) #define VIB_MAX_LEVEL_mV (3100)
#define VIB_MIN_LEVEL_mV (1200) #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 #define MAX_FF_SPEED 0xff
@@ -118,10 +119,10 @@ static void pm8xxx_work_handler(struct work_struct *work)
vib->active = true; vib->active = true;
vib->level = ((VIB_MAX_LEVELS * vib->speed) / MAX_FF_SPEED) + vib->level = ((VIB_MAX_LEVELS * vib->speed) / MAX_FF_SPEED) +
VIB_MIN_LEVEL_mV; VIB_MIN_LEVEL_mV;
vib->level /= 100; vib->level /= VIB_PER_STEP_mV;
} else { } else {
vib->active = false; 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); pm8xxx_vib_set(vib, vib->active);