summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2021-06-18 22:14:11 +0800
committerLee Jones <joneslee@google.com>2021-10-04 19:47:14 +0100
commitf5bbe21fc119c2d1880dfa623e44e9b019cb31c8 (patch)
treec4eebeca563880123487ec0ba9ad77849a8cefb6
parentb4eaf78b97b0dfb14fe552be49b3959e5177d5d3 (diff)
downloadmediatek-f5bbe21fc119c2d1880dfa623e44e9b019cb31c8.tar.gz
regulator: da9052: Ensure enough delay time for .set_voltage_time_sel
[ Upstream commit a336dc8f683e5be794186b5643cd34cb28dd2c53 ] Use DIV_ROUND_UP to prevent truncation by integer division issue. This ensures we return enough delay time. Also fix returning negative value when new_sel < old_sel. Signed-off-by: Axel Lin <axel.lin@ingics.com> Link: https://lore.kernel.org/r/20210618141412.4014912-1-axel.lin@ingics.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I4938f120c4f89268fbe0e047fc8f51c5eb3450eb
-rw-r--r--drivers/regulator/da9052-regulator.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/regulator/da9052-regulator.c b/drivers/regulator/da9052-regulator.c
index 00033625a09c..aac96ff2d813 100644
--- a/drivers/regulator/da9052-regulator.c
+++ b/drivers/regulator/da9052-regulator.c
@@ -258,7 +258,8 @@ static int da9052_regulator_set_voltage_time_sel(struct regulator_dev *rdev,
case DA9052_ID_BUCK3:
case DA9052_ID_LDO2:
case DA9052_ID_LDO3:
- ret = (new_sel - old_sel) * info->step_uV / 6250;
+ ret = DIV_ROUND_UP(abs(new_sel - old_sel) * info->step_uV,
+ 6250);
break;
}