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

Merge tag 'regulator-fix-v6.2-rc3' of... 

Merge tag 'regulator-fix-v6.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "A couple of small driver specific fixes, one of which I queued for 6.1
  but didn't actually send out so has had *plenty* of testing in -next"

* tag 'regulator-fix-v6.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: qcom-rpmh: PM8550 ldo11 regulator is an nldo
  regulator: da9211: Use irq handler when ready
parents e58f087e f528fe21

drivers/regulator/da9211-regulator.c

+6 −5
Original line number Diff line number Diff line
@@ -498,6 +498,12 @@ static int da9211_i2c_probe(struct i2c_client *i2c) 


	chip->chip_irq = i2c->irq;



	ret = da9211_regulator_init(chip);

	if (ret < 0) {

		dev_err(chip->dev, "Failed to initialize regulator: %d\n", ret);

		return ret;

	}



	if (chip->chip_irq != 0) {

		ret = devm_request_threaded_irq(chip->dev, chip->chip_irq, NULL,

					da9211_irq_handler,
@@ -512,11 +518,6 @@ static int da9211_i2c_probe(struct i2c_client *i2c) 
		dev_warn(chip->dev, "No IRQ configured\n");

	}



	ret = da9211_regulator_init(chip);



	if (ret < 0)

		dev_err(chip->dev, "Failed to initialize regulator: %d\n", ret);



	return ret;

}

drivers/regulator/qcom-rpmh-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -1016,7 +1016,7 @@ static const struct rpmh_vreg_init_data pm8550_vreg_data[] = { 
	RPMH_VREG("ldo8",   "ldo%s8",  &pmic5_pldo_lv, "vdd-l8-l9"),

	RPMH_VREG("ldo9",   "ldo%s9",  &pmic5_pldo,    "vdd-l8-l9"),

	RPMH_VREG("ldo10",  "ldo%s10", &pmic5_nldo,    "vdd-l1-l4-l10"),

	RPMH_VREG("ldo11",  "ldo%s11", &pmic5_pldo,    "vdd-l11"),

	RPMH_VREG("ldo11",  "ldo%s11", &pmic5_nldo,    "vdd-l11"),

	RPMH_VREG("ldo12",  "ldo%s12", &pmic5_pldo,    "vdd-l12"),

	RPMH_VREG("ldo13",  "ldo%s13", &pmic5_pldo,    "vdd-l2-l13-l14"),

	RPMH_VREG("ldo14",  "ldo%s14", &pmic5_pldo,    "vdd-l2-l13-l14"),