12 files changed, 56 insertions, 34 deletions

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index ae511b738441..acab3ef8a310 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -397,7 +397,8 @@ config MFD_TC6387XB
 
 config MFD_TC6393XB
         bool "Support Toshiba TC6393XB"
-        depends on GPIOLIB && ARM && HAVE_CLK
+        depends on ARM && HAVE_CLK
+        select GPIOLIB
         select MFD_CORE
         select MFD_TMIO
         help
diff --git a/drivers/mfd/ab8500-gpadc.c b/drivers/mfd/ab8500-gpadc.c
index 866f95960b4b..29d72a259c85 100644
--- a/drivers/mfd/ab8500-gpadc.c
+++ b/drivers/mfd/ab8500-gpadc.c
@@ -342,7 +342,7 @@ int ab8500_gpadc_read_raw(struct ab8500_gpadc *gpadc, u8 channel)
 
                  /*
                   * Delay might be needed for ABB8500 cut 3.0, if not, remove
-                  * when hardware will be availible
+                  * when hardware will be available
                   */
                         msleep(1);
                         break;
diff --git a/drivers/mfd/da9052-i2c.c b/drivers/mfd/da9052-i2c.c
index 82c9d6450286..352c58b5a90d 100644
--- a/drivers/mfd/da9052-i2c.c
+++ b/drivers/mfd/da9052-i2c.c
@@ -46,7 +46,7 @@ static int da9052_i2c_enable_multiwrite(struct da9052 *da9052)
         return 0;
 }
 
-static struct i2c_device_id da9052_i2c_id[] = {
+static const struct i2c_device_id da9052_i2c_id[] = {
         {"da9052", DA9052},
         {"da9053-aa", DA9053_AA},
         {"da9053-ba", DA9053_BA},
@@ -104,7 +104,7 @@ static int __devinit da9052_i2c_probe(struct i2c_client *client,
                 const struct of_device_id *deviceid;
 
                 deviceid = of_match_node(dialog_dt_ids, np);
-                id = (const struct i2c_device_id *)deviceid->data;
+                id = deviceid->data;
         }
 #endif
 
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index bac4876d090f..00b8b0f3dfb6 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -522,6 +522,7 @@ static struct dsiescclk dsiescclk[3] = {
         }
 };
 
+
 /*
 * Used by MCDE to setup all necessary PRCMU registers
 */
diff --git a/drivers/mfd/mcp-sa11x0.c b/drivers/mfd/mcp-sa11x0.c
index c54e244ca0cf..f99d6299ec24 100644
--- a/drivers/mfd/mcp-sa11x0.c
+++ b/drivers/mfd/mcp-sa11x0.c
@@ -24,7 +24,7 @@
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
-#include <mach/mcp.h>
+#include <linux/platform_data/mfd-mcp-sa11x0.h>
 
 #define DRIVER_NAME "sa11x0-mcp"
 
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index cb4910ac4d12..55d589981412 100644
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -1259,7 +1259,7 @@ static int menelaus_probe(struct i2c_client *client,
         return 0;
 fail2:
         free_irq(client->irq, menelaus);
-        flush_work_sync(&menelaus->work);
+        flush_work(&menelaus->work);
 fail1:
         kfree(menelaus);
         return err;
@@ -1270,7 +1270,7 @@ static int __exit menelaus_remove(struct i2c_client *client)
         struct menelaus_chip    *menelaus = i2c_get_clientdata(client);
 
         free_irq(client->irq, menelaus);
-        flush_work_sync(&menelaus->work);
+        flush_work(&menelaus->work);
         kfree(menelaus);
         the_menelaus = NULL;
         return 0;
diff --git a/drivers/mfd/rc5t583.c b/drivers/mfd/rc5t583.c
index d6b50728ea32..f1a024ecdb1e 100644
--- a/drivers/mfd/rc5t583.c
+++ b/drivers/mfd/rc5t583.c
@@ -281,7 +281,7 @@ static int __devinit rc5t583_i2c_probe(struct i2c_client *i2c,
 
         if (i2c->irq) {
                 ret = rc5t583_irq_init(rc5t583, i2c->irq, pdata->irq_base);
-                /* Still continue with waring if irq init fails */
+                /* Still continue with warning, if irq init fails */
                 if (ret)
                         dev_warn(&i2c->dev, "IRQ init failed: %d\n", ret);
                 else
diff --git a/drivers/mfd/rdc321x-southbridge.c b/drivers/mfd/rdc321x-southbridge.c
index 0f70dce61160..fbabc3cbe350 100644
--- a/drivers/mfd/rdc321x-southbridge.c
+++ b/drivers/mfd/rdc321x-southbridge.c
@@ -1,5 +1,5 @@
 /*
- * RDC321x MFD southbrige driver
+ * RDC321x MFD southbridge driver
  *
  * Copyright (C) 2007-2010 Florian Fainelli <florian@openwrt.org>
  * Copyright (C) 2010 Bernhard Loos <bernhardloos@googlemail.com>
diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
index 95ef40754dd7..467464368773 100644
--- a/drivers/mfd/tps6586x.c
+++ b/drivers/mfd/tps6586x.c
@@ -25,6 +25,7 @@
 #include <linux/i2c.h>
 #include <linux/regmap.h>
 #include <linux/regulator/of_regulator.h>
+#include <linux/regulator/machine.h>
 
 #include <linux/mfd/core.h>
 #include <linux/mfd/tps6586x.h>
@@ -350,6 +351,7 @@ failed:
 
 #ifdef CONFIG_OF
 static struct of_regulator_match tps6586x_matches[] = {
+        { .name = "sys",     .driver_data = (void *)TPS6586X_ID_SYS     },
         { .name = "sm0",     .driver_data = (void *)TPS6586X_ID_SM_0    },
         { .name = "sm1",     .driver_data = (void *)TPS6586X_ID_SM_1    },
         { .name = "sm2",     .driver_data = (void *)TPS6586X_ID_SM_2    },
@@ -373,6 +375,7 @@ static struct tps6586x_platform_data *tps6586x_parse_dt(struct i2c_client *clien
         struct tps6586x_platform_data *pdata;
         struct tps6586x_subdev_info *devs;
         struct device_node *regs;
+        const char *sys_rail_name = NULL;
         unsigned int count;
         unsigned int i, j;
         int err;
@@ -395,12 +398,22 @@ static struct tps6586x_platform_data *tps6586x_parse_dt(struct i2c_client *clien
                 return NULL;
 
         for (i = 0, j = 0; i < num && j < count; i++) {
+                struct regulator_init_data *reg_idata;
+
                 if (!tps6586x_matches[i].init_data)
                         continue;
 
+                reg_idata  = tps6586x_matches[i].init_data;
                 devs[j].name = "tps6586x-regulator";
                 devs[j].platform_data = tps6586x_matches[i].init_data;
                 devs[j].id = (int)tps6586x_matches[i].driver_data;
+                if (devs[j].id == TPS6586X_ID_SYS)
+                        sys_rail_name = reg_idata->constraints.name;
+
+                if ((devs[j].id == TPS6586X_ID_LDO_5) ||
+                        (devs[j].id == TPS6586X_ID_LDO_RTC))
+                        reg_idata->supply_regulator = sys_rail_name;
+
                 devs[j].of_node = tps6586x_matches[i].of_node;
                 j++;
         }
diff --git a/drivers/mfd/tps65911-comparator.c b/drivers/mfd/tps65911-comparator.c
index 5a62e6bf89ae..0b6e361432c4 100644
--- a/drivers/mfd/tps65911-comparator.c
+++ b/drivers/mfd/tps65911-comparator.c
@@ -136,7 +136,7 @@ static __devinit int tps65911_comparator_probe(struct platform_device *pdev)
 
         ret = comp_threshold_set(tps65910, COMP2, pdata->vmbch2_threshold);
         if (ret < 0) {
-                dev_err(&pdev->dev, "cannot set COMP2 theshold\n");
+                dev_err(&pdev->dev, "cannot set COMP2 threshold\n");
                 return ret;
         }
 
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 3d700129cf3e..4ae642320205 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -1104,12 +1104,7 @@ static void clocks_init(struct device *dev,
         u32 rate;
         u8 ctrl = HFCLK_FREQ_26_MHZ;
 
-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
-        if (cpu_is_omap2430())
-                osc = clk_get(dev, "osc_ck");
-        else
-                osc = clk_get(dev, "osc_sys_ck");
-
+        osc = clk_get(dev, "fck");
         if (IS_ERR(osc)) {
                 printk(KERN_WARNING "Skipping twl internal clock init and "
                                 "using bootloader value (unknown osc rate)\n");
@@ -1119,18 +1114,6 @@ static void clocks_init(struct device *dev,
         rate = clk_get_rate(osc);
         clk_put(osc);
 
-#else
-        /* REVISIT for non-OMAP systems, pass the clock rate from
-         * board init code, using platform_data.
-         */
-        osc = ERR_PTR(-EIO);
-
-        printk(KERN_WARNING "Skipping twl internal clock init and "
-               "using bootloader value (unknown osc rate)\n");
-
-        return;
-#endif
-
         switch (rate) {
         case 19200000:
                 ctrl = HFCLK_FREQ_19p2_MHZ;
@@ -1192,10 +1175,23 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
         struct twl4030_platform_data    *pdata = client->dev.platform_data;
         struct device_node              *node = client->dev.of_node;
+        struct platform_device          *pdev;
         int                             irq_base = 0;
         int                             status;
         unsigned                        i, num_slaves;
 
+        pdev = platform_device_alloc(DRIVER_NAME, -1);
+        if (!pdev) {
+                dev_err(&client->dev, "can't alloc pdev\n");
+                return -ENOMEM;
+        }
+
+        status = platform_device_add(pdev);
+        if (status) {
+                platform_device_put(pdev);
+                return status;
+        }
+
         if (node && !pdata) {
                 /*
                  * XXX: Temporary pdata until the information is correctly
@@ -1204,23 +1200,30 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
                 pdata = devm_kzalloc(&client->dev,
                                      sizeof(struct twl4030_platform_data),
                                      GFP_KERNEL);
-                if (!pdata)
-                        return -ENOMEM;
+                if (!pdata) {
+                        status = -ENOMEM;
+                        goto free;
+                }
         }
 
         if (!pdata) {
                 dev_dbg(&client->dev, "no platform data?\n");
-                return -EINVAL;
+                status = -EINVAL;
+                goto free;
         }
 
+        platform_set_drvdata(pdev, pdata);
+
         if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C) == 0) {
                 dev_dbg(&client->dev, "can't talk I2C?\n");
-                return -EIO;
+                status = -EIO;
+                goto free;
         }
 
         if (inuse) {
                 dev_dbg(&client->dev, "driver is already in use\n");
-                return -EBUSY;
+                status = -EBUSY;
+                goto free;
         }
 
         if ((id->driver_data) & TWL6030_CLASS) {
@@ -1255,7 +1258,7 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
         inuse = true;
 
         /* setup clock framework */
-        clocks_init(&client->dev, pdata->clock);
+        clocks_init(&pdev->dev, pdata->clock);
 
         /* read TWL IDCODE Register */
         if (twl_id == TWL4030_CLASS_ID) {
@@ -1305,6 +1308,9 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
 fail:
         if (status < 0)
                 twl_remove(client);
+free:
+        if (status < 0)
+                platform_device_unregister(pdev);
 
         return status;
 }
diff --git a/drivers/mfd/wm8994-irq.c b/drivers/mfd/wm8994-irq.c
index 0aac4aff17a5..a050e56a9bbd 100644
--- a/drivers/mfd/wm8994-irq.c
+++ b/drivers/mfd/wm8994-irq.c
@@ -135,6 +135,7 @@ static struct regmap_irq_chip wm8994_irq_chip = {
         .status_base = WM8994_INTERRUPT_STATUS_1,
         .mask_base = WM8994_INTERRUPT_STATUS_1_MASK,
         .ack_base = WM8994_INTERRUPT_STATUS_1,
+        .runtime_pm = true,
 };
 
 int wm8994_irq_init(struct wm8994 *wm8994)