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

Commit 21f3c961 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v4.3-rc4' of... 

Merge tag 'regulator-fix-v4.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "Two fixes here, one device specific fix for axp20x and a core fix for
   cases where one regulator is supplying another which broke probe
  deferral, substituting in a dummy regulator too aggressively"

* tag 'regulator-fix-v4.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: core: Handle probe deferral from DT when resolving supplies
  regulator: axp20x: Fix enable bit indexes for DCDC4 and DCDC5
parents 79c7c7ac 22ca03a3

drivers/regulator/axp20x-regulator.c

+2 −2
Original line number 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,

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

	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,

		 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 */

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

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

drivers/regulator/core.c

+4 −0
Original line number Diff line number Diff line
@@ -1403,6 +1403,10 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) 
			return 0;

		}



		/* Did the lookup explicitly defer for us? */

		if (ret == -EPROBE_DEFER)

			return ret;



		if (have_full_constraints()) {

			r = dummy_regulator_rdev;

		} else {