4 files changed, 46 insertions, 10 deletions

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 5ac3aa48473b..022b1863d36c 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -569,13 +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 @@ static struct mfd_cell wm5110_devs[] = {
         { .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 @@ static struct mfd_cell wm8997_devs[] = {
         { .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)
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index 53f371dcbb6e..b9ce60c301de 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -480,7 +480,6 @@ static struct clk_mgt clk_mgt[PRCMU_NUM_REG_CLOCKS] = {
         CLK_MGT_ENTRY(PER6CLK, PLL_DIV, true),
         CLK_MGT_ENTRY(PER7CLK, PLL_DIV, true),
         CLK_MGT_ENTRY(LCDCLK, PLL_FIX, true),
-        CLK_MGT_ENTRY(BML8580CLK, PLL_DIV, true),
         CLK_MGT_ENTRY(BMLCLK, PLL_DIV, true),
         CLK_MGT_ENTRY(HSITXCLK, PLL_DIV, true),
         CLK_MGT_ENTRY(HSIRXCLK, PLL_DIV, true),
diff --git a/drivers/mfd/dbx500-prcmu-regs.h b/drivers/mfd/dbx500-prcmu-regs.h
index 4f6f0fa5d3b7..7cc32a8ff01c 100644
--- a/drivers/mfd/dbx500-prcmu-regs.h
+++ b/drivers/mfd/dbx500-prcmu-regs.h
@@ -32,7 +32,6 @@
 #define PRCM_PER7CLK_MGT        (0x040)
 #define PRCM_LCDCLK_MGT         (0x044)
 #define PRCM_BMLCLK_MGT         (0x04C)
-#define PRCM_BML8580CLK_MGT     (0x108)
 #define PRCM_HSITXCLK_MGT       (0x050)
 #define PRCM_HSIRXCLK_MGT       (0x054)
 #define PRCM_HDMICLK_MGT        (0x058)
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index f421586f29fb..adc8ea36e7c4 100644
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@ -20,6 +20,7 @@
 #include <linux/module.h>
 #include <linux/irqdomain.h>
 #include <linux/of.h>
+#include <linux/regulator/consumer.h>
 
 static struct device_type mfd_dev_type = {
         .name   = "mfd_device",
@@ -99,6 +100,13 @@ static int mfd_add_device(struct device *parent, int id,
         pdev->dev.dma_mask = parent->dma_mask;
         pdev->dev.dma_parms = parent->dma_parms;
 
+        ret = devm_regulator_bulk_register_supply_alias(
+                        &pdev->dev, cell->parent_supplies,
+                        parent, cell->parent_supplies,
+                        cell->num_parent_supplies);
+        if (ret < 0)
+                goto fail_res;
+
         if (parent->of_node && cell->of_compatible) {
                 for_each_child_of_node(parent->of_node, np) {
                         if (of_device_is_compatible(np, cell->of_compatible)) {
@@ -112,12 +120,12 @@ static int mfd_add_device(struct device *parent, int id,
                 ret = platform_device_add_data(pdev,
                                         cell->platform_data, cell->pdata_size);
                 if (ret)
-                        goto fail_res;
+                        goto fail_alias;
         }
 
         ret = mfd_platform_add_cell(pdev, cell);
         if (ret)
-                goto fail_res;
+                goto fail_alias;
 
         for (r = 0; r < cell->num_resources; r++) {
                 res[r].name = cell->resources[r].name;
@@ -152,17 +160,17 @@ static int mfd_add_device(struct device *parent, int id,
                 if (!cell->ignore_resource_conflicts) {
                         ret = acpi_check_resource_conflict(&res[r]);
                         if (ret)
-                                goto fail_res;
+                                goto fail_alias;
                 }
         }
 
         ret = platform_device_add_resources(pdev, res, cell->num_resources);
         if (ret)
-                goto fail_res;
+                goto fail_alias;
 
         ret = platform_device_add(pdev);
         if (ret)
-                goto fail_res;
+                goto fail_alias;
 
         if (cell->pm_runtime_no_callbacks)
                 pm_runtime_no_callbacks(&pdev->dev);
@@ -171,6 +179,10 @@ static int mfd_add_device(struct device *parent, int id,
 
         return 0;
 
+fail_alias:
+        devm_regulator_bulk_unregister_supply_alias(&pdev->dev,
+                                                    cell->parent_supplies,
+                                                    cell->num_parent_supplies);
 fail_res:
         kfree(res);
 fail_device: