diff options
| author | Axel Lin <axel.lin@ingics.com> | 2013-10-02 16:47:56 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-03 19:49:21 +0400 |
| commit | 43f6fc9542d6c42cc2e5783536ed31d90516c999 (patch) | |
| tree | c2fba92b748b11674d9b984c3e8b2848b87f2d90 /drivers/regulator/as3722-regulator.c | |
| parent | bc407334e9a6a745de5360395282beb2690adf48 (diff) | |
| download | linux-43f6fc9542d6c42cc2e5783536ed31d90516c999.tar.xz | |
regulator: as3722: Fix equation to calculate max_uV in regulator_lin_range macro
Fix off-by-one in the equation to calculate max_uV and also adjust the _min_uV
setting accordingly.
For LDOs:
The voltage select bits set the LDO output voltage 0.825V...3.3V, 25mV steps
....00h : LDO off
01h-24h : V_LDO4 = 0.8V + ldo4_vsel * 25mV
= 0.825V + (ldo4_vsel - 1h) * 25mV
25h-3Fh : do not use
40h-7Fh : V_LDO4 = 1.725V + (ldo4_vsel - 40h) * 25mV
For SD2345:
The voltage select bits set the DC/DC output voltage level and power the DC/DC
converter down.
....00h : DC/DC powered down
01h-40h : V_SD2 = 0.6V + sd2_vsel * 12.5mV
= 0.6125V + (sd2_vsel - 1h) * 12.5mV
41h-70h : V_SD2 = 1.4V + (sd2_vsel - 40h) * 25mV
= 1.425V + (sd2_vsel - 41h) * 25mV
71h-7Fh : V_SD2 = 2.6V + (sd2_vsel - 70h) * 50mV
= 2.65V + (sd2_vsel - 71h) * 50mV
Note, the third entry in as3722_sd2345_ranges is wrong in current code.
Fix it based on the datasheet.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/regulator/as3722-regulator.c')
| -rw-r--r-- | drivers/regulator/as3722-regulator.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/regulator/as3722-regulator.c b/drivers/regulator/as3722-regulator.c index 16a5d26a2d35..01a8b1788981 100644 --- a/drivers/regulator/as3722-regulator.c +++ b/drivers/regulator/as3722-regulator.c @@ -441,11 +441,11 @@ static struct regulator_ops as3722_ldo3_extcntrl_ops = { .max_sel = _max_sel, \ .uV_step = _step_uV, \ .min_uV = _min_uV, \ - .max_uV = _min_uV + (_max_sel - _min_sel + 1) * _step_uV, \ + .max_uV = _min_uV + (_max_sel - _min_sel) * _step_uV, \ } static const struct regulator_linear_range as3722_ldo_ranges[] = { - regulator_lin_range(0x01, 0x24, 800000, 25000), + regulator_lin_range(0x01, 0x24, 825000, 25000), regulator_lin_range(0x40, 0x7F, 1725000, 25000), }; @@ -605,9 +605,9 @@ static int as3722_sd016_set_current_limit(struct regulator_dev *rdev, } static const struct regulator_linear_range as3722_sd2345_ranges[] = { - regulator_lin_range(0x01, 0x40, 600000, 12500), - regulator_lin_range(0x41, 0x70, 1400000, 25000), - regulator_lin_range(0x71, 0x7F, 1725000, 50000), + regulator_lin_range(0x01, 0x40, 612500, 12500), + regulator_lin_range(0x41, 0x70, 1425000, 25000), + regulator_lin_range(0x71, 0x7F, 2650000, 50000), }; static struct regulator_ops as3722_sd016_ops = { |