Merge branch 'spi-4.18' into spi-linus

[linux.git] / drivers / regulator / wm8994-regulator.c

diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c
index d3a5f48119c2e286b3d885157b2403ec564dbe7f..7a4ce6df4f22a95323e2a0cae05572a0baa34a2f 100644 (file)
--- a/drivers/regulator/wm8994-regulator.c
+++ b/drivers/regulator/wm8994-regulator.c
@@ -19,7 +19,7 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
-#include <linux/gpio/consumer.h>
+#include <linux/gpio.h>
 #include <linux/slab.h>
 
 #include <linux/mfd/wm8994/core.h>
@@ -129,7 +129,6 @@ static int wm8994_ldo_probe(struct platform_device *pdev)
        int id = pdev->id % ARRAY_SIZE(pdata->ldo);
        struct regulator_config config = { };
        struct wm8994_ldo *ldo;
-       struct gpio_desc *gpiod;
        int ret;
 
        dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1);
@@ -146,14 +145,12 @@ static int wm8994_ldo_probe(struct platform_device *pdev)
        config.driver_data = ldo;
        config.regmap = wm8994->regmap;
        config.init_data = &ldo->init_data;
-
-       /* Look up LDO enable GPIO from the parent device node */
-       gpiod = devm_gpiod_get_optional(pdev->dev.parent,
-                                       id ? "wlf,ldo2ena" : "wlf,ldo1ena",
-                                       GPIOD_OUT_LOW);
-       if (IS_ERR(gpiod))
-               return PTR_ERR(gpiod);
-       config.ena_gpiod = gpiod;
+       if (pdata) {
+               config.ena_gpio = pdata->ldo[id].enable;
+       } else if (wm8994->dev->of_node) {
+               config.ena_gpio = wm8994->pdata.ldo[id].enable;
+               config.ena_gpio_initialized = true;
+       }
 
        /* Use default constraints if none set up */
        if (!pdata || !pdata->ldo[id].init_data || wm8994->dev->of_node) {
@@ -162,7 +159,7 @@ static int wm8994_ldo_probe(struct platform_device *pdev)
 
                ldo->init_data = wm8994_ldo_default[id];
                ldo->init_data.consumer_supplies = &ldo->supply;
-               if (!gpiod)
+               if (!config.ena_gpio)
                        ldo->init_data.constraints.valid_ops_mask = 0;
        } else {
                ldo->init_data = *pdata->ldo[id].init_data;