diff options
| author | Mark Brown <broonie@kernel.org> | 2016-12-12 12:17:19 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-12-12 12:17:19 +0000 |
| commit | c1b0789271b13dd7561f78370122c3183cd74ab0 (patch) | |
| tree | f4eda3db7bd1b059de81cd4bec7fbb871661dbe2 /drivers/regulator | |
| parent | 69973b830859bc6529a7a0468ba0d80ee5117826 (diff) | |
| parent | 618c808968852609d2d9f0e5cfc351a4807ef8d0 (diff) | |
| download | linux-stable-c1b0789271b13dd7561f78370122c3183cd74ab0.tar.gz linux-stable-c1b0789271b13dd7561f78370122c3183cd74ab0.tar.bz2 linux-stable-c1b0789271b13dd7561f78370122c3183cd74ab0.zip | |
Merge remote-tracking branch 'regulator/fix/axp20x' into regulator-linus
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/axp20x-regulator.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c index 54382ef902c6..e6a512ebeae2 100644 --- a/drivers/regulator/axp20x-regulator.c +++ b/drivers/regulator/axp20x-regulator.c @@ -337,10 +337,18 @@ static const struct regulator_desc axp809_regulators[] = { AXP22X_ELDO2_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(1)), AXP_DESC(AXP809, ELDO3, "eldo3", "eldoin", 700, 3300, 100, AXP22X_ELDO3_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(2)), - AXP_DESC_IO(AXP809, LDO_IO0, "ldo_io0", "ips", 700, 3300, 100, + /* + * Note the datasheet only guarantees reliable operation up to + * 3.3V, this needs to be enforced via dts provided constraints + */ + AXP_DESC_IO(AXP809, LDO_IO0, "ldo_io0", "ips", 700, 3800, 100, AXP22X_LDO_IO0_V_OUT, 0x1f, AXP20X_GPIO0_CTRL, 0x07, AXP22X_IO_ENABLED, AXP22X_IO_DISABLED), - AXP_DESC_IO(AXP809, LDO_IO1, "ldo_io1", "ips", 700, 3300, 100, + /* + * Note the datasheet only guarantees reliable operation up to + * 3.3V, this needs to be enforced via dts provided constraints + */ + AXP_DESC_IO(AXP809, LDO_IO1, "ldo_io1", "ips", 700, 3800, 100, AXP22X_LDO_IO1_V_OUT, 0x1f, AXP20X_GPIO1_CTRL, 0x07, AXP22X_IO_ENABLED, AXP22X_IO_DISABLED), AXP_DESC_FIXED(AXP809, RTC_LDO, "rtc_ldo", "ips", 1800), |