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

Commit a2b0db5b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v4.7-rc5' of... 

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

Pull regulator fixes from Mark Brown:
 "Two small fixes for the regulator subsystem - one fixing a crash with
  one of the devices supported by the max77620 driver, another fixing
  startup for the anatop regulator when it starts up with the regulator
  in bypass mode"

* tag 'regulator-fix-v4.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: max77620: check for valid regulator info
  regulator: anatop: allow regulator to be in bypass mode
parents 44385120 a29a36f2

drivers/regulator/anatop-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ static int anatop_regulator_probe(struct platform_device *pdev) 
		if (!sreg->sel && !strcmp(sreg->name, "vddpu"))

			sreg->sel = 22;



		if (!sreg->sel) {

		if (!sreg->bypass && !sreg->sel) {

			dev_err(&pdev->dev, "Failed to read a valid default voltage selector.\n");

			return -EINVAL;

		}

drivers/regulator/max77620-regulator.c

+6 −1
Original line number Diff line number Diff line
@@ -123,6 +123,9 @@ static int max77620_regulator_set_fps_src(struct max77620_regulator *pmic, 
	unsigned int val;

	int ret;



	if (!rinfo)

		return 0;



	switch (fps_src) {

	case MAX77620_FPS_SRC_0:

	case MAX77620_FPS_SRC_1:
@@ -171,6 +174,9 @@ static int max77620_regulator_set_fps_slots(struct max77620_regulator *pmic, 
	int pd = rpdata->active_fps_pd_slot;

	int ret = 0;



	if (!rinfo)

		return 0;



	if (is_suspend) {

		pu = rpdata->suspend_fps_pu_slot;

		pd = rpdata->suspend_fps_pd_slot;
@@ -680,7 +686,6 @@ static struct max77620_regulator_info max77620_regs_info[MAX77620_NUM_REGS] = { 
	RAIL_SD(SD1, sd1, "in-sd1", SD1, 600000, 1550000, 12500, 0x22, SD1),

	RAIL_SD(SD2, sd2, "in-sd2", SDX, 600000, 3787500, 12500, 0xFF, NONE),

	RAIL_SD(SD3, sd3, "in-sd3", SDX, 600000, 3787500, 12500, 0xFF, NONE),

	RAIL_SD(SD4, sd4, "in-sd4", SDX, 600000, 3787500, 12500, 0xFF, NONE),



	RAIL_LDO(LDO0, ldo0, "in-ldo0-1", N, 800000, 2375000, 25000),

	RAIL_LDO(LDO1, ldo1, "in-ldo0-1", N, 800000, 2375000, 25000),