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

Commit c1b07892 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/fix/axp20x' into regulator-linus

parents 69973b83 618c8089

drivers/regulator/axp20x-regulator.c

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