]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
regulator: twl-regulator: fix n_voltages for twl6030 variable LDOs
authorColin Cross <ccross@android.com>
Fri, 27 May 2011 19:25:27 +0000 (12:25 -0700)
committerLiam Girdwood <lrg@slimlogic.co.uk>
Mon, 30 May 2011 12:50:45 +0000 (13:50 +0100)
The n_voltages initializer for the TWL6030_ADJUSTABLE_LDO macro is
off by one, causing the the highest supported voltage to be
unreachable.  Setting the machine constraints to only allow the
highest voltage causes errors:

machine_constraints_voltage: VAUX3_6030: unsupportable voltage constraints
twl_reg twl_reg.39: can't register VAUX3_6030, -22
twl_reg: probe of twl_reg.39 failed with error -22

This patch fixes the off by one error.  Tested by setting
VAUX3_6030 to 3.3V.

Signed-off-by: Colin Cross <ccross@android.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
drivers/regulator/twl-regulator.c

index 87fe0f75a56eed01375e0e2a393dbea6c1cd98b2..503c2bc64c848ab2ce166766487a95be9ae51ccc 100644 (file)
@@ -864,7 +864,7 @@ static struct regulator_ops twlsmps_ops = {
        .desc = { \
                .name = #label, \
                .id = TWL6030_REG_##label, \
-               .n_voltages = (max_mVolts - min_mVolts)/100, \
+               .n_voltages = (max_mVolts - min_mVolts)/100 + 1, \
                .ops = &twl6030ldo_ops, \
                .type = REGULATOR_VOLTAGE, \
                .owner = THIS_MODULE, \