Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 353915f0 authored by Mark Brown's avatar Mark Brown
Browse files

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

Merge remote-tracking branches 'regulator/fix/axp20x' and 'regulator/fix/mt6311' into regulator-linus
parents 3ad4b051 3cb99e2e aab3c3f3

drivers/regulator/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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.

drivers/regulator/axp20x-regulator.c

+2 −2
Original line number Diff line number Diff line
@@ -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)