diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 22:43:33 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 22:43:33 -0500 |
| commit | 925f14dc2da122eabc809ce738098abaaa9f285c (patch) | |
| tree | 6f1e4f46dee51059fc7ee18f19ea3f979d4224c2 /drivers/regulator/wm831x-dcdc.c | |
| parent | 8ee005112dc2fbf4e0bd4e335d26ff0393a38da1 (diff) | |
| parent | 43f1f2165e12d15a262ad1d0827d2960fe66f75b (diff) | |
Merge remote-tracking branch 'regulator/topic/wm831x' into regulator-next
Diffstat (limited to 'drivers/regulator/wm831x-dcdc.c')
| -rw-r--r-- | drivers/regulator/wm831x-dcdc.c | 3 |
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, | |||
| 223 | if (min_uV < 600000) | 223 | if (min_uV < 600000) |
| 224 | vsel = 0; | 224 | vsel = 0; |
| 225 | else if (min_uV <= 1800000) | 225 | else if (min_uV <= 1800000) |
| 226 | vsel = ((min_uV - 600000) / 12500) + 8; | 226 | vsel = DIV_ROUND_UP(min_uV - 600000, 12500) + 8; |
| 227 | else | 227 | else |
| 228 | return -EINVAL; | 228 | return -EINVAL; |
| 229 | 229 | ||
| @@ -993,4 +993,5 @@ MODULE_DESCRIPTION("WM831x DC-DC convertor driver"); | |||
| 993 | MODULE_LICENSE("GPL"); | 993 | MODULE_LICENSE("GPL"); |
| 994 | MODULE_ALIAS("platform:wm831x-buckv"); | 994 | MODULE_ALIAS("platform:wm831x-buckv"); |
| 995 | MODULE_ALIAS("platform:wm831x-buckp"); | 995 | MODULE_ALIAS("platform:wm831x-buckp"); |
| 996 | MODULE_ALIAS("platform:wm831x-boostp"); | ||
| 996 | MODULE_ALIAS("platform:wm831x-epe"); | 997 | MODULE_ALIAS("platform:wm831x-epe"); |