projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f40ddaa
)
regulator: axp20x: Fix axp20x_set_ramp_delay
author
Axel Lin
<axel.lin@ingics.com>
Sat, 21 Dec 2019 08:10:49 +0000
(16:10 +0800)
committer
Mark Brown
<broonie@kernel.org>
Wed, 25 Dec 2019 18:16:05 +0000
(18:16 +0000)
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>
drivers/regulator/axp20x-regulator.c
patch
|
blob
|
history
diff --git
a/drivers/regulator/axp20x-regulator.c
b/drivers/regulator/axp20x-regulator.c
index
fe369cb
..
16f0c85
100644
(file)
--- 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) {