summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/max77686.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-06-08 17:21:44 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-11 12:09:14 +0800
commit23ca6bf2318fecfbb9cd9d524e82d5029ef365bf (patch)
tree5d32920931ea8f314ef76d85335c865cc0dbf897 /drivers/regulator/max77686.c
parent98a175b60f46a80dfa44fb0e0807f2e5a351f35f (diff)
downloadlinux-23ca6bf2318fecfbb9cd9d524e82d5029ef365bf.tar.gz
linux-23ca6bf2318fecfbb9cd9d524e82d5029ef365bf.tar.bz2
linux-23ca6bf2318fecfbb9cd9d524e82d5029ef365bf.zip
regulator: max77686: Fix the delay time for set_voltage_time_sel
rdev->desc->uV_step * abs(new_selector - old_selector) returns uV. The unit of ramp_rate is mV/us. Thus 1000 should be multiplied. Signed-off-by: Axel Lin <axel.lin@gmail.com> Reviewed-by: Yadwinder Singh Brar <yadi.brar@samsung.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/max77686.c')
-rw-r--r--drivers/regulator/max77686.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686.c
index b0c146df42d1..2dd4ac91d283 100644
--- a/drivers/regulator/max77686.c
+++ b/drivers/regulator/max77686.c
@@ -77,7 +77,7 @@ static int max77686_set_dvs_voltage_time_sel(struct regulator_dev *rdev,
return DIV_ROUND_UP(rdev->desc->uV_step *
abs(new_selector - old_selector),
- ramp_rate[max77686->ramp_delay]);
+ ramp_rate[max77686->ramp_delay] * 1000);
}
static int max77686_set_voltage_time_sel(struct regulator_dev *rdev,
@@ -85,7 +85,7 @@ static int max77686_set_voltage_time_sel(struct regulator_dev *rdev,
{
/* Unconditionally 100 mV/us */
return DIV_ROUND_UP(rdev->desc->uV_step *
- abs(new_selector - old_selector), 100);
+ abs(new_selector - old_selector), 100 * 1000);
}
static struct regulator_ops max77686_ops = {