summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@sirena.org.uk>2013-04-28 02:13:47 +0100
committerMark Brown <broonie@sirena.org.uk>2013-04-28 02:13:47 +0100
commit22a712b90ca5411cb37df82dfb50144c87175fb4 (patch)
tree62b36d2d5f5dd1a1091b6d4e89bec90c8187c78d /drivers/regulator
parenteea8e85e3b4c19cfa1028822adfd85842553d841 (diff)
parent1864b670902260d1c239f37e984f26de8fbad319 (diff)
downloadlinux-22a712b90ca5411cb37df82dfb50144c87175fb4.tar.bz2
Merge remote-tracking branch 'regulator/topic/tps62360' into v3.9-rc8
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/tps62360-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/tps62360-regulator.c b/drivers/regulator/tps62360-regulator.c
index acbd63fde415..612919c3081c 100644
--- a/drivers/regulator/tps62360-regulator.c
+++ b/drivers/regulator/tps62360-regulator.c
@@ -278,7 +278,7 @@ static int tps62360_init_dcdc(struct tps62360_chip *tps,
__func__, REG_RAMPCTRL, ret);
return ret;
}
- ramp_ctrl = (ramp_ctrl >> 4) & 0x7;
+ ramp_ctrl = (ramp_ctrl >> 5) & 0x7;
/* ramp mV/us = 32/(2^ramp_ctrl) */
tps->desc.ramp_delay = DIV_ROUND_UP(32000, BIT(ramp_ctrl));