Merge tag 'fbdev-fixes-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba...

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / arizona-core.c

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 1c3ae57082ed7bc1a2dcd8583a507875f3b7d92b..cfc191abae4a5d777c07e59fa26fd78ec4340287 100644 (file)
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -508,19 +508,31 @@ int arizona_of_get_type(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(arizona_of_get_type);
 
+int arizona_of_get_named_gpio(struct arizona *arizona, const char *prop,
+                             bool mandatory)
+{
+       int gpio;
+
+       gpio = of_get_named_gpio(arizona->dev->of_node, prop, 0);
+       if (gpio < 0) {
+               if (mandatory)
+                       dev_err(arizona->dev,
+                               "Mandatory DT gpio %s missing/malformed: %d\n",
+                               prop, gpio);
+
+               gpio = 0;
+       }
+
+       return gpio;
+}
+EXPORT_SYMBOL_GPL(arizona_of_get_named_gpio);
+
 static int arizona_of_get_core_pdata(struct arizona *arizona)
 {
+       struct arizona_pdata *pdata = &arizona->pdata;
        int ret, i;
 
-       arizona->pdata.reset = of_get_named_gpio(arizona->dev->of_node,
-                                                "wlf,reset", 0);
-       if (arizona->pdata.reset < 0)
-               arizona->pdata.reset = 0;
-
-       arizona->pdata.ldoena = of_get_named_gpio(arizona->dev->of_node,
-                                                 "wlf,ldoena", 0);
-       if (arizona->pdata.ldoena < 0)
-               arizona->pdata.ldoena = 0;
+       pdata->reset = arizona_of_get_named_gpio(arizona, "wlf,reset", true);
 
        ret = of_property_read_u32_array(arizona->dev->of_node,
                                         "wlf,gpio-defaults",
@@ -571,6 +583,7 @@ static const char *wm5102_supplies[] = {
        "CPVDD",
        "SPKVDDL",
        "SPKVDDR",
+       "MICVDD",
 };
 
 static const struct mfd_cell wm5102_devs[] = {
@@ -652,6 +665,9 @@ int arizona_dev_init(struct arizona *arizona)
                return -EINVAL;
        }
 
+       /* Mark DCVDD as external, LDO1 driver will clear if internal */
+       arizona->external_dcvdd = true;
+
        ret = mfd_add_devices(arizona->dev, -1, early_devs,
                              ARRAY_SIZE(early_devs), NULL, 0, NULL);
        if (ret != 0) {
@@ -851,14 +867,6 @@ int arizona_dev_init(struct arizona *arizona)
                             arizona->pdata.gpio_defaults[i]);
        }
 
-       /*
-        * LDO1 can only be used to supply DCVDD so if it has no
-        * consumers then DCVDD is supplied externally.
-        */
-       if (arizona->pdata.ldo1 &&
-           arizona->pdata.ldo1->num_consumer_supplies == 0)
-               arizona->external_dcvdd = true;
-
        pm_runtime_set_autosuspend_delay(arizona->dev, 100);
        pm_runtime_use_autosuspend(arizona->dev);
        pm_runtime_enable(arizona->dev);