Merge remote-tracking branch 'regulator/for-next'

diff --combined drivers/mfd/arizona-core.c
index ba808b74423892bcca62881a0a0c1e8aeb002746,022b1863d36cdf5af689be720a972baef3a54820..75e180ceecf3fac16f9a432ada482130624dfe01
--- 1/drivers/mfd/arizona-core.c
--- 2/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@@ -540,7 -540,7 +540,7 @@@ static int arizona_of_get_core_pdata(st
                for (i = 0; i < ARRAY_SIZE(arizona->pdata.gpio_defaults); i++) {
                        if (arizona->pdata.gpio_defaults[i] > 0xffff)
                                arizona->pdata.gpio_defaults[i] = 0;
 -                      if (arizona->pdata.gpio_defaults[i] == 0)
 +                      else if (arizona->pdata.gpio_defaults[i] == 0)
                                arizona->pdata.gpio_defaults[i] = 0x10000;
                }
        } else {
@@@ -569,13 -569,25 +569,25 @@@ static struct mfd_cell early_devs[] = 
        { .name = "arizona-ldo1" },
  };
  
+ static const char *wm5102_supplies[] = {
+       "DBVDD2",
+       "DBVDD3",
+       "CPVDD",
+       "SPKVDDL",
+       "SPKVDDR",
+ };
+ 
  static struct mfd_cell wm5102_devs[] = {
        { .name = "arizona-micsupp" },
        { .name = "arizona-extcon" },
        { .name = "arizona-gpio" },
        { .name = "arizona-haptics" },
        { .name = "arizona-pwm" },
-       { .name = "wm5102-codec" },
+       {
+               .name = "wm5102-codec",
+               .parent_supplies = wm5102_supplies,
+               .num_parent_supplies = ARRAY_SIZE(wm5102_supplies),
+       },
  };
  
  static struct mfd_cell wm5110_devs[] = {
@@@ -584,7 -596,17 +596,17 @@@
        { .name = "arizona-gpio" },
        { .name = "arizona-haptics" },
        { .name = "arizona-pwm" },
-       { .name = "wm5110-codec" },
+       {
+               .name = "wm5110-codec",
+               .parent_supplies = wm5102_supplies,
+               .num_parent_supplies = ARRAY_SIZE(wm5102_supplies),
+       },
+ };
+ 
+ static const char *wm8997_supplies[] = {
+       "DBVDD2",
+       "CPVDD",
+       "SPKVDD",
  };
  
  static struct mfd_cell wm8997_devs[] = {
@@@ -593,7 -615,11 +615,11 @@@
        { .name = "arizona-gpio" },
        { .name = "arizona-haptics" },
        { .name = "arizona-pwm" },
-       { .name = "wm8997-codec" },
+       {
+               .name = "wm8997-codec",
+               .parent_supplies = wm8997_supplies,
+               .num_parent_supplies = ARRAY_SIZE(wm8997_supplies),
+       },
  };
  
  int arizona_dev_init(struct arizona *arizona)
@@@ -607,11 -633,11 +633,11 @@@
        dev_set_drvdata(arizona->dev, arizona);
        mutex_init(&arizona->clk_lock);
  
 -      arizona_of_get_core_pdata(arizona);
 -
        if (dev_get_platdata(arizona->dev))
                memcpy(&arizona->pdata, dev_get_platdata(arizona->dev),
                       sizeof(arizona->pdata));
 +      else
 +              arizona_of_get_core_pdata(arizona);
  
        regcache_cache_only(arizona->regmap, true);