Merge remote-tracking branches 'regulator/fix/axp20x' and 'regulator/fix/mt6311' into regulator-linus
This commit is contained in:
commit
353915f0b4
|
@ -446,6 +446,7 @@ config REGULATOR_MC13892
|
||||||
config REGULATOR_MT6311
|
config REGULATOR_MT6311
|
||||||
tristate "MediaTek MT6311 PMIC"
|
tristate "MediaTek MT6311 PMIC"
|
||||||
depends on I2C
|
depends on I2C
|
||||||
|
select REGMAP_I2C
|
||||||
help
|
help
|
||||||
Say y here to select this option to enable the power regulator of
|
Say y here to select this option to enable the power regulator of
|
||||||
MediaTek MT6311 PMIC.
|
MediaTek MT6311 PMIC.
|
||||||
|
|
|
@ -27,8 +27,8 @@
|
||||||
#define AXP20X_IO_ENABLED 0x03
|
#define AXP20X_IO_ENABLED 0x03
|
||||||
#define AXP20X_IO_DISABLED 0x07
|
#define AXP20X_IO_DISABLED 0x07
|
||||||
|
|
||||||
#define AXP22X_IO_ENABLED 0x04
|
#define AXP22X_IO_ENABLED 0x03
|
||||||
#define AXP22X_IO_DISABLED 0x03
|
#define AXP22X_IO_DISABLED 0x04
|
||||||
|
|
||||||
#define AXP20X_WORKMODE_DCDC2_MASK BIT(2)
|
#define AXP20X_WORKMODE_DCDC2_MASK BIT(2)
|
||||||
#define AXP20X_WORKMODE_DCDC3_MASK BIT(1)
|
#define AXP20X_WORKMODE_DCDC3_MASK BIT(1)
|
||||||
|
|
Loading…
Reference in a new issue