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

Commit c4604e49 authored by Joonyoung Shim's avatar Joonyoung Shim Committed by Liam Girdwood
Browse files

regulator: Default GPIO controlled WM8994 regulators to disabled 



This ensures that if the GPIO was not enabled prior to the driver
starting the regulator API will insert the required powerup ramp
delay when it enables the regulator.  The gpiolib API does not
provide this information.

[Rewrote changelog to describe the actual change -- broonie.]

Signed-off-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 27ef7f00

drivers/regulator/wm8994-regulator.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -219,8 +219,6 @@ static __devinit int wm8994_ldo_probe(struct platform_device *pdev) 




	ldo->wm8994 = wm8994;

	ldo->wm8994 = wm8994;





	ldo->is_enabled = true;



	if (pdata->ldo[id].enable && gpio_is_valid(pdata->ldo[id].enable)) {

	if (pdata->ldo[id].enable && gpio_is_valid(pdata->ldo[id].enable)) {

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

		ldo->enable = pdata->ldo[id].enable;
@@ -237,7 +235,8 @@ static __devinit int wm8994_ldo_probe(struct platform_device *pdev) 
				ret);

				ret);

			goto err_gpio;

			goto err_gpio;

		}

		}

	}

	} else

		ldo->is_enabled = true;





	ldo->regulator = regulator_register(&wm8994_ldo_desc[id], &pdev->dev,

	ldo->regulator = regulator_register(&wm8994_ldo_desc[id], &pdev->dev,

					     pdata->ldo[id].init_data, ldo);

					     pdata->ldo[id].init_data, ldo);