summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/core.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-06-18 14:03:16 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-18 10:56:58 +0100
commitea38d13fd1666bc030cb1c0feec5b0da2f89f9b2 (patch)
tree463ca3908e6541a434c73117e716556fac49b596 /drivers/regulator/core.c
parent398715ab9414b3b7741c8239c254111f5016821c (diff)
downloadlinux-ea38d13fd1666bc030cb1c0feec5b0da2f89f9b2.tar.bz2
regulator: core: Change the unit of ramp_delay from mV/uS to uV/uS
This change makes it possible to set ramp_delay with 0.xxx mV/uS without truncation issue. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/core.c')
-rw-r--r--drivers/regulator/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 73a3d874ca6e..ce0a3462e0de 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2319,11 +2319,11 @@ int regulator_set_voltage_time_sel(struct regulator_dev *rdev,
if (rdev->desc->uV_step) {
return DIV_ROUND_UP(rdev->desc->uV_step *
abs(new_selector - old_selector),
- ramp_delay * 1000);
+ ramp_delay);
} else if (rdev->desc->volt_table) {
return DIV_ROUND_UP(abs(rdev->desc->volt_table[new_selector] -
rdev->desc->volt_table[old_selector]),
- ramp_delay * 1000);
+ ramp_delay);
} else {
rdev_warn(rdev, "Unsupported voltage mapping settings\n");
}