Merge remote-tracking branches 'regulator/fix/axp20x' and...

Merge remote-tracking branches 'regulator/fix/axp20x' and 'regulator/fix/mt6311' into regulator-linus

Merge remote-tracking branches 'regulator/fix/axp20x' and...
Merge remote-tracking branches 'regulator/fix/axp20x' and 'regulator/fix/mt6311' into regulator-linus
353915f0 · Mark Brown · 3ad4b051 · 3cb99e2e · aab3c3f3 · 353915f0
Commit 353915f0 authored Jan 12, 2016 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

drivers/regulator/Kconfig drivers/regulator/Kconfig +1 -0

drivers/regulator/axp20x-regulator.c drivers/regulator/axp20x-regulator.c +2 -2

No files found.
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -446,6 +446,7 @@ config REGULATOR_MC13892
 config REGULATOR_MT6311
 	tristate "MediaTek MT6311 PMIC"
 	depends on I2C
+	select REGMAP_I2C
 	help
 	  Say y here to select this option to enable the power regulator of
 	  MediaTek MT6311 PMIC.

--- a/drivers/regulator/axp20x-regulator.c
+++ b/drivers/regulator/axp20x-regulator.c
@@ -27,8 +27,8 @@
 #define AXP20X_IO_ENABLED		0x03
 #define AXP20X_IO_DISABLED		0x07

-#define AXP22X_IO_ENABLED		0x04
-#define AXP22X_IO_DISABLED		0x03
+#define AXP22X_IO_ENABLED		0x03
+#define AXP22X_IO_DISABLED		0x04

 #define AXP20X_WORKMODE_DCDC2_MASK	BIT(2)
 #define AXP20X_WORKMODE_DCDC3_MASK	BIT(1)