| From bdaf82200e25a46a144fccc51d4a8d6b7719cb88 Mon Sep 17 00:00:00 2001 |
| From: Axel Lin <axel.lin@ingics.com> |
| Date: Sat, 21 Dec 2019 16:10:49 +0800 |
| Subject: [PATCH] regulator: axp20x: Fix axp20x_set_ramp_delay |
| |
| commit 71dd2fe5dec171b34b71603a81bb46c24c498fde upstream. |
| |
| Current code set incorrect bits when set ramp_delay for AXP20X_DCDC2, |
| fix it. |
| |
| Fixes: d29f54df8b16 ("regulator: axp20x: add support for set_ramp_delay for AXP209") |
| Signed-off-by: Axel Lin <axel.lin@ingics.com> |
| Link: https://lore.kernel.org/r/20191221081049.32490-1-axel.lin@ingics.com |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c |
| index 989506bd90b1..501cccc806d5 100644 |
| --- a/drivers/regulator/axp20x-regulator.c |
| +++ b/drivers/regulator/axp20x-regulator.c |
| @@ -413,10 +413,13 @@ static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp) |
| int i; |
| |
| for (i = 0; i < rate_count; i++) { |
| - if (ramp <= slew_rates[i]) |
| - cfg = AXP20X_DCDC2_LDO3_V_RAMP_LDO3_RATE(i); |
| - else |
| + if (ramp > slew_rates[i]) |
| break; |
| + |
| + if (id == AXP20X_DCDC2) |
| + cfg = AXP20X_DCDC2_LDO3_V_RAMP_DCDC2_RATE(i); |
| + else |
| + cfg = AXP20X_DCDC2_LDO3_V_RAMP_LDO3_RATE(i); |
| } |
| |
| if (cfg == 0xff) { |
| -- |
| 2.7.4 |
| |
