diff options
| author | Joonyoung Shim <jy0922.shim@samsung.com> | 2010-08-06 15:48:24 +0100 |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-08-11 11:38:02 +0100 |
| commit | c4604e49c1a5832a58789a22eba7ca982933e1be (patch) | |
| tree | e1213b269f22e6a9f98e7698518ffe3a5eec04a2 /drivers/regulator | |
| parent | 27ef7f00c96e45192d5dcc7e4589376f3a2fded3 (diff) | |
| download | linux-stable-c4604e49c1a5832a58789a22eba7ca982933e1be.tar.gz linux-stable-c4604e49c1a5832a58789a22eba7ca982933e1be.tar.bz2 linux-stable-c4604e49c1a5832a58789a22eba7ca982933e1be.zip | |
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: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/wm8994-regulator.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c index 5a1dc8a24d35..03713bc66e4a 100644 --- a/drivers/regulator/wm8994-regulator.c +++ b/drivers/regulator/wm8994-regulator.c @@ -219,8 +219,6 @@ static __devinit int wm8994_ldo_probe(struct platform_device *pdev) ldo->wm8994 = wm8994; - ldo->is_enabled = true; - if (pdata->ldo[id].enable && gpio_is_valid(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); goto err_gpio; } - } + } else + ldo->is_enabled = true; ldo->regulator = regulator_register(&wm8994_ldo_desc[id], &pdev->dev, pdata->ldo[id].init_data, ldo); |