diff options
| author | Mark Brown <broonie@kernel.org> | 2015-10-06 12:00:42 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-10-06 12:00:42 +0100 |
| commit | 22ca03a3ad63bb08d543af462b741b6bf2c329ed (patch) | |
| tree | 63c8d5d6583d05d995cd798b3768c92e92fca2b6 /drivers | |
| parent | 6710f223433588af582c0e4dbecbca72a36c4594 (diff) | |
| parent | 6b3600b4ba0810c84437cf76556d9afbd55c1bfc (diff) | |
| download | linux-22ca03a3ad63bb08d543af462b741b6bf2c329ed.tar.bz2 | |
Merge remote-tracking branch 'regulator/fix/axp20x' into regulator-linus
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/regulator/axp20x-regulator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c index 01bf3476a791..a9567af7cec0 100644 --- a/drivers/regulator/axp20x-regulator.c +++ b/drivers/regulator/axp20x-regulator.c @@ -192,9 +192,9 @@ static const struct regulator_desc axp22x_regulators[] = { AXP_DESC(AXP22X, DCDC3, "dcdc3", "vin3", 600, 1860, 20, AXP22X_DCDC3_V_OUT, 0x3f, AXP22X_PWR_OUT_CTRL1, BIT(3)), AXP_DESC(AXP22X, DCDC4, "dcdc4", "vin4", 600, 1540, 20, - AXP22X_DCDC4_V_OUT, 0x3f, AXP22X_PWR_OUT_CTRL1, BIT(3)), + AXP22X_DCDC4_V_OUT, 0x3f, AXP22X_PWR_OUT_CTRL1, BIT(4)), AXP_DESC(AXP22X, DCDC5, "dcdc5", "vin5", 1000, 2550, 50, - AXP22X_DCDC5_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL1, BIT(4)), + AXP22X_DCDC5_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL1, BIT(5)), /* secondary switchable output of DCDC1 */ AXP_DESC_SW(AXP22X, DC1SW, "dc1sw", "dcdc1", 1600, 3400, 100, AXP22X_DCDC1_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(7)), |