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

Commit 3ea93896 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mark Brown
Browse files

regulator: wm8994: Use GPIO parsed from DT when registering regulators 



Ensure the regulators are registered with a GPIO parsed from the device
tree when available.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent e3d27775

drivers/regulator/wm8994-regulator.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -149,9 +149,11 @@ static int wm8994_ldo_probe(struct platform_device *pdev) 
	config.init_data = &ldo->init_data;

	config.init_data = &ldo->init_data;

	if (pdata)

	if (pdata)

		config.ena_gpio = pdata->ldo[id].enable;

		config.ena_gpio = pdata->ldo[id].enable;

	else if (wm8994->dev->of_node)

		config.ena_gpio = wm8994->pdata.ldo[id].enable;





	/* Use default constraints if none set up */

	/* Use default constraints if none set up */

	if (!pdata || !pdata->ldo[id].init_data) {

	if (!pdata || !pdata->ldo[id].init_data || wm8994->dev->of_node) {

		dev_dbg(wm8994->dev, "Using default init data, supply %s %s\n",

		dev_dbg(wm8994->dev, "Using default init data, supply %s %s\n",

			ldo->supply.dev_name, ldo->supply.supply);

			ldo->supply.dev_name, ldo->supply.supply);