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

Commit 22ca03a3 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 6710f223 6b3600b4

drivers/regulator/axp20x-regulator.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -192,9 +192,9 @@ static const struct regulator_desc axp22x_regulators[] = { 
	AXP_DESC(AXP22X, DCDC3, "dcdc3", "vin3", 600, 1860, 20,

	AXP_DESC(AXP22X, DCDC3, "dcdc3", "vin3", 600, 1860, 20,

		 AXP22X_DCDC3_V_OUT, 0x3f, AXP22X_PWR_OUT_CTRL1, BIT(3)),

		 AXP22X_DCDC3_V_OUT, 0x3f, AXP22X_PWR_OUT_CTRL1, BIT(3)),

	AXP_DESC(AXP22X, DCDC4, "dcdc4", "vin4", 600, 1540, 20,

	AXP_DESC(AXP22X, DCDC4, "dcdc4", "vin4", 600, 1540, 20,

		 AXP22X_DCDC4_V_OUT, 0x3f, AXP22X_PWR_OUT_CTRL1, BIT(3)),

		 AXP22X_DCDC4_V_OUT, 0x3f, AXP22X_PWR_OUT_CTRL1, BIT(4)),

	AXP_DESC(AXP22X, DCDC5, "dcdc5", "vin5", 1000, 2550, 50,

	AXP_DESC(AXP22X, DCDC5, "dcdc5", "vin5", 1000, 2550, 50,

		 AXP22X_DCDC5_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL1, BIT(4)),

		 AXP22X_DCDC5_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL1, BIT(5)),

	/* secondary switchable output of DCDC1 */

	/* secondary switchable output of DCDC1 */

	AXP_DESC_SW(AXP22X, DC1SW, "dc1sw", "dcdc1", 1600, 3400, 100,

	AXP_DESC_SW(AXP22X, DC1SW, "dc1sw", "dcdc1", 1600, 3400, 100,

		    AXP22X_DCDC1_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(7)),

		    AXP22X_DCDC1_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(7)),