diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 13:34:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 13:34:56 -0400 |
| commit | d15d76448bb58c7832e954b6a8f1e301720b7866 (patch) | |
| tree | 7891c9e0779f5df33840be9cdba1f0331459e97c /drivers/regulator/max8925-regulator.c | |
| parent | 0c2fe82a9b106f1c03719783134360586d718a69 (diff) | |
| parent | 4992fa1fd425f1934f503ffa96b68e235b89db9a (diff) | |
Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator updates for 3.4 from Mark Brown:
"This has been a fairly quiet release from a regulator point of view,
the only real framework features added were devm support and a
convenience helper for setting up fixed voltage regulators.
We also added a couple of drivers (but will drop the BQ240022 driver
via the arm-soc tree as it's been replaced by the more generic
gpio-regulator driver) and Axel Lin continued his relentless and
generally awesome stream of fixes and cleanups."
* tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (93 commits)
regulator: Fix up a confusing dev_warn when DT lookup fails
regulator: Convert tps6507x to set_voltage_sel
regulator: Refactor tps6507x to use one tps6507x_pmic_ops for all LDOs and DCDCs
regulator: Make s5m8767_get_voltage_register always return correct register
regulator: s5m8767: Check pdata->buck[2|3|4]_gpiodvs earlier
regulator: tps65910: Provide settling time for DCDC voltage change
regulator: Add Anatop regulator driver
regulator: Simplify implementation of tps65912_get_voltage_dcdc
regulator: Use tps65912_set_voltage_sel for both DCDCx and LDOx
regulator: tps65910: Provide settling time for enabling rails
regulator: max8925: Use DIV_ROUND_UP macro
regulator: tps65912: Use simple equations to get register address
regulator: Fix the logic of tps65910_get_mode
regulator: Merge tps65217_pmic_ldo234_ops and tps65217_pmic_dcdc_ops to tps65217_pmic_ops
regulator: Use DIV_ROUND_CLOSEST in wm8350_isink_get_current
regulator: Use array to store dcdc_range settings for tps65912
regulator: Rename s5m8767_convert_voltage to s5m8767_convert_voltage_to_sel
regulator: tps6524x: Remove unneeded comment for N_REGULATORS
regulator: Rename set_voltage_sel callback function name to *_sel
regulator: Fix s5m8767_set_voltage_time_sel calculation value
...
Diffstat (limited to 'drivers/regulator/max8925-regulator.c')
| -rw-r--r-- | drivers/regulator/max8925-regulator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/max8925-regulator.c b/drivers/regulator/max8925-regulator.c index cc290d37c463..2f242f43096e 100644 --- a/drivers/regulator/max8925-regulator.c +++ b/drivers/regulator/max8925-regulator.c | |||
| @@ -73,7 +73,7 @@ static int max8925_set_voltage(struct regulator_dev *rdev, | |||
| 73 | min_uV, max_uV); | 73 | min_uV, max_uV); |
| 74 | return -EINVAL; | 74 | return -EINVAL; |
| 75 | } | 75 | } |
| 76 | data = (min_uV - info->min_uV + info->step_uV - 1) / info->step_uV; | 76 | data = DIV_ROUND_UP(min_uV - info->min_uV, info->step_uV); |
| 77 | *selector = data; | 77 | *selector = data; |
| 78 | data <<= info->vol_shift; | 78 | data <<= info->vol_shift; |
| 79 | mask = ((1 << info->vol_nbits) - 1) << info->vol_shift; | 79 | mask = ((1 << info->vol_nbits) - 1) << info->vol_shift; |
| @@ -140,7 +140,7 @@ static int max8925_set_dvm_voltage(struct regulator_dev *rdev, int uV) | |||
| 140 | if (uV < SD1_DVM_VMIN || uV > SD1_DVM_VMAX) | 140 | if (uV < SD1_DVM_VMIN || uV > SD1_DVM_VMAX) |
| 141 | return -EINVAL; | 141 | return -EINVAL; |
| 142 | 142 | ||
| 143 | data = (uV - SD1_DVM_VMIN + SD1_DVM_STEP - 1) / SD1_DVM_STEP; | 143 | data = DIV_ROUND_UP(uV - SD1_DVM_VMIN, SD1_DVM_STEP); |
| 144 | data <<= SD1_DVM_SHIFT; | 144 | data <<= SD1_DVM_SHIFT; |
| 145 | mask = 3 << SD1_DVM_SHIFT; | 145 | mask = 3 << SD1_DVM_SHIFT; |
| 146 | 146 | ||