lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'regulator/topic/tps62360' into v3.9-rc8

Browse Source
This commit is contained in:
Mark Brown
2013-04-28 02:13:47 +01:00
parent eea8e85e3b 1864b67090
commit 22a712b90c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/regulator/tps62360-regulator.c
View File

@@ -278,7 +278,7 @@ static int tps62360_init_dcdc(struct tps62360_chip *tps,
__func__, REG_RAMPCTRL, ret); __func__, REG_RAMPCTRL, ret);
return ret; return ret;
} }
ramp_ctrl = (ramp_ctrl >> 4) & 0x7; ramp_ctrl = (ramp_ctrl >> 5) & 0x7;
/* ramp mV/us = 32/(2^ramp_ctrl) */ /* ramp mV/us = 32/(2^ramp_ctrl) */
tps->desc.ramp_delay = DIV_ROUND_UP(32000, BIT(ramp_ctrl)); tps->desc.ramp_delay = DIV_ROUND_UP(32000, BIT(ramp_ctrl));