summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-10 12:43:33 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-10 12:43:33 +0900
commit925f14dc2da122eabc809ce738098abaaa9f285c (patch)
tree6f1e4f46dee51059fc7ee18f19ea3f979d4224c2 /drivers/regulator
parent8ee005112dc2fbf4e0bd4e335d26ff0393a38da1 (diff)
parent43f1f2165e12d15a262ad1d0827d2960fe66f75b (diff)
downloadlinux-925f14dc2da122eabc809ce738098abaaa9f285c.tar.bz2
Merge remote-tracking branch 'regulator/topic/wm831x' into regulator-next
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/wm831x-dcdc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c
index bce25658e12e..0af6898bcd79 100644
--- a/drivers/regulator/wm831x-dcdc.c
+++ b/drivers/regulator/wm831x-dcdc.c
@@ -223,7 +223,7 @@ static int wm831x_buckv_map_voltage(struct regulator_dev *rdev,
if (min_uV < 600000)
vsel = 0;
else if (min_uV <= 1800000)
- vsel = ((min_uV - 600000) / 12500) + 8;
+ vsel = DIV_ROUND_UP(min_uV - 600000, 12500) + 8;
else
return -EINVAL;
@@ -993,4 +993,5 @@ MODULE_DESCRIPTION("WM831x DC-DC convertor driver");
MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:wm831x-buckv");
MODULE_ALIAS("platform:wm831x-buckp");
+MODULE_ALIAS("platform:wm831x-boostp");
MODULE_ALIAS("platform:wm831x-epe");