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: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c
index f03fbf1ff38a0ea98d8a35039357383e2c16856f..a612c356a697cd89e9cb107a2840f20e32acb8e8 100644 (file)
--- a/drivers/regulator/wm8994-regulator.c
+++ b/drivers/regulator/wm8994-regulator.c
@@ -149,9 +149,11 @@ static int wm8994_ldo_probe(struct platform_device *pdev)
        config.init_data = &ldo->init_data;
        if (pdata)
                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 */
-       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",
                        ldo->supply.dev_name, ldo->supply.supply);