Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12

1 files changed, 6 insertions, 32 deletions

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 75e180c..5ac3aa4 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -540,7 +540,7 @@ static int arizona_of_get_core_pdata(struct arizona *arizona)
 		for (i = 0; i < ARRAY_SIZE(arizona->pdata.gpio_defaults); i++) {
 			if (arizona->pdata.gpio_defaults[i] > 0xffff)
 				arizona->pdata.gpio_defaults[i] = 0;
-			else if (arizona->pdata.gpio_defaults[i] == 0)
+			if (arizona->pdata.gpio_defaults[i] == 0)
 				arizona->pdata.gpio_defaults[i] = 0x10000;
 		}
 	} else {
@@ -569,25 +569,13 @@ 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",
-		.parent_supplies = wm5102_supplies,
-		.num_parent_supplies = ARRAY_SIZE(wm5102_supplies),
-	},
+	{ .name = "wm5102-codec" },
 };
 
 static struct mfd_cell wm5110_devs[] = {
@@ -596,17 +584,7 @@ static struct mfd_cell wm5110_devs[] = {
 	{ .name = "arizona-gpio" },
 	{ .name = "arizona-haptics" },
 	{ .name = "arizona-pwm" },
-	{
-		.name = "wm5110-codec",
-		.parent_supplies = wm5102_supplies,
-		.num_parent_supplies = ARRAY_SIZE(wm5102_supplies),
-	},
-};
-
-static const char *wm8997_supplies[] = {
-	"DBVDD2",
-	"CPVDD",
-	"SPKVDD",
+	{ .name = "wm5110-codec" },
 };
 
 static struct mfd_cell wm8997_devs[] = {
@@ -615,11 +593,7 @@ static struct mfd_cell wm8997_devs[] = {
 	{ .name = "arizona-gpio" },
 	{ .name = "arizona-haptics" },
 	{ .name = "arizona-pwm" },
-	{
-		.name = "wm8997-codec",
-		.parent_supplies = wm8997_supplies,
-		.num_parent_supplies = ARRAY_SIZE(wm8997_supplies),
-	},
+	{ .name = "wm8997-codec" },
 };
 
 int arizona_dev_init(struct arizona *arizona)
@@ -633,11 +607,11 @@ int arizona_dev_init(struct arizona *arizona)
 	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);