diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-03 13:46:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-03 13:46:38 -0800 |
| commit | 3f67790d2b7e322bcf363ec717085dd78c3ea7cd (patch) | |
| tree | 7be20232078a2e801ed93bcdb72f0d955dd9836f /drivers/regulator/twl6030-regulator.c | |
| parent | cd44691f7177b2c1e1509d1a17d9b198ebaa34eb (diff) | |
| parent | 206c4720092d2a24bfefc041b377e889a220ffbf (diff) | |
| download | linux-3f67790d2b7e322bcf363ec717085dd78c3ea7cd.tar.bz2 | |
Merge tag 'regulator-fix-v4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown:
"Three changes here: two run of the mill driver specific fixes and a
change from Mark Rutland which reverts some new device specific ACPI
binding code which was added during the merge window as there are
concerns about this sending the wrong signal about usage of regulators
in ACPI systems"
* tag 'regulator-fix-v4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: fixed: Revert support for ACPI interface
regulator: axp20x: AXP806: Fix dcdcb being set instead of dcdce
regulator: twl6030: fix range comparison, allowing vsel = 59
Diffstat (limited to 'drivers/regulator/twl6030-regulator.c')
| -rw-r--r-- | drivers/regulator/twl6030-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/twl6030-regulator.c b/drivers/regulator/twl6030-regulator.c index 4864b9d742c0..716191046a70 100644 --- a/drivers/regulator/twl6030-regulator.c +++ b/drivers/regulator/twl6030-regulator.c @@ -452,7 +452,7 @@ static int twl6030smps_map_voltage(struct regulator_dev *rdev, int min_uV, vsel = 62; else if ((min_uV > 1800000) && (min_uV <= 1900000)) vsel = 61; - else if ((min_uV > 1350000) && (min_uV <= 1800000)) + else if ((min_uV > 1500000) && (min_uV <= 1800000)) vsel = 60; else if ((min_uV > 1350000) && (min_uV <= 1500000)) vsel = 59; |