Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6

* 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6: (80 commits)
  mfd: Fix missing abx500 header file updates
  mfd: Add missing <linux/io.h> include to intel_msic
  x86, mrst: add platform support for MSIC MFD driver
  mfd: Expose TurnOnStatus in ab8500 sysfs
  mfd: Remove support for early drop ab8500 chip
  mfd: Add support for ab8500 v3.3
  mfd: Add ab8500 interrupt disable hook
  mfd: Convert db8500-prcmu panic() into pr_crit()
  mfd: Refactor db8500-prcmu request_clock() function
  mfd: Rename db8500-prcmu init function
  mfd: Fix db5500-prcmu defines
  mfd: db8500-prcmu voltage domain consumers additions
  mfd: db8500-prcmu reset code retrieval
  mfd: db8500-prcmu tweak for modem wakeup
  mfd: Add db8500-pcmu watchdog accessor functions for watchdog
  mfd: hwacc power state db8500-prcmu accessor
  mfd: Add db8500-prcmu accessors for PLL and SGA clock
  mfd: Move to the new db500 PRCMU API
  mfd: Create a common interface for dbx500 PRCMU drivers
  mfd: Initialize DB8500 PRCMU regs
  ...

Fix up trivial conflicts in
	arch/arm/mach-imx/mach-mx31moboard.c
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/mach-u300/include/mach/irqs.h
	drivers/mfd/wm831x-spi.c

2 files changed, 64 insertions, 31 deletions

diff --git a/drivers/leds/leds-asic3.c b/drivers/leds/leds-asic3.c
index 22f847c890c..fbd5d88ccd8 100644
--- a/drivers/leds/leds-asic3.c
+++ b/drivers/leds/leds-asic3.c
@@ -107,9 +107,10 @@ static int __devinit asic3_led_probe(struct platform_device *pdev)
         }
 
         led->cdev->name = led->name;
-        led->cdev->default_trigger = led->default_trigger;
+        led->cdev->flags = LED_CORE_SUSPENDRESUME;
         led->cdev->brightness_set = brightness_set;
         led->cdev->blink_set = blink_set;
+        led->cdev->default_trigger = led->default_trigger;
 
         ret = led_classdev_register(&pdev->dev, led->cdev);
         if (ret < 0)
@@ -136,12 +137,44 @@ static int __devexit asic3_led_remove(struct platform_device *pdev)
         return mfd_cell_disable(pdev);
 }
 
+static int asic3_led_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        const struct mfd_cell *cell = mfd_get_cell(pdev);
+        int ret;
+
+        ret = 0;
+        if (cell->suspend)
+                ret = (*cell->suspend)(pdev);
+
+        return ret;
+}
+
+static int asic3_led_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        const struct mfd_cell *cell = mfd_get_cell(pdev);
+        int ret;
+
+        ret = 0;
+        if (cell->resume)
+                ret = (*cell->resume)(pdev);
+
+        return ret;
+}
+
+static const struct dev_pm_ops asic3_led_pm_ops = {
+        .suspend        = asic3_led_suspend,
+        .resume         = asic3_led_resume,
+};
+
 static struct platform_driver asic3_led_driver = {
         .probe          = asic3_led_probe,
         .remove         = __devexit_p(asic3_led_remove),
         .driver         = {
                 .name   = "leds-asic3",
                 .owner  = THIS_MODULE,
+                .pm     = &asic3_led_pm_ops,
         },
 };
 
diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13783.c
index f369e56d654..b3393a9f213 100644
--- a/drivers/leds/leds-mc13783.c
+++ b/drivers/leds/leds-mc13783.c
@@ -21,13 +21,13 @@
 #include <linux/platform_device.h>
 #include <linux/leds.h>
 #include <linux/workqueue.h>
-#include <linux/mfd/mc13783.h>
+#include <linux/mfd/mc13xxx.h>
 #include <linux/slab.h>
 
 struct mc13783_led {
         struct led_classdev     cdev;
         struct work_struct      work;
-        struct mc13783          *master;
+        struct mc13xxx          *master;
         enum led_brightness     new_brightness;
         int                     id;
 };
@@ -111,11 +111,11 @@ static void mc13783_led_work(struct work_struct *work)
                 break;
         }
 
-        mc13783_lock(led->master);
+        mc13xxx_lock(led->master);
 
-        mc13783_reg_rmw(led->master, reg, mask, value);
+        mc13xxx_reg_rmw(led->master, reg, mask, value);
 
-        mc13783_unlock(led->master);
+        mc13xxx_unlock(led->master);
 }
 
 static void mc13783_led_set(struct led_classdev *led_cdev,
@@ -172,23 +172,23 @@ static int __devinit mc13783_led_setup(struct mc13783_led *led, int max_current)
                 break;
         }
 
-        mc13783_lock(led->master);
+        mc13xxx_lock(led->master);
 
-        ret = mc13783_reg_rmw(led->master, reg, mask << shift,
+        ret = mc13xxx_reg_rmw(led->master, reg, mask << shift,
                                                 value << shift);
 
-        mc13783_unlock(led->master);
+        mc13xxx_unlock(led->master);
         return ret;
 }
 
 static int __devinit mc13783_leds_prepare(struct platform_device *pdev)
 {
-        struct mc13783_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
-        struct mc13783 *dev = dev_get_drvdata(pdev->dev.parent);
+        struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
+        struct mc13xxx *dev = dev_get_drvdata(pdev->dev.parent);
         int ret = 0;
         int reg = 0;
 
-        mc13783_lock(dev);
+        mc13xxx_lock(dev);
 
         if (pdata->flags & MC13783_LED_TC1HALF)
                 reg |= MC13783_LED_C1_TC1HALF_BIT;
@@ -196,7 +196,7 @@ static int __devinit mc13783_leds_prepare(struct platform_device *pdev)
         if (pdata->flags & MC13783_LED_SLEWLIMTC)
                 reg |= MC13783_LED_Cx_SLEWLIM_BIT;
 
-        ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_1, reg);
+        ret = mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_1, reg);
         if (ret)
                 goto out;
 
@@ -206,7 +206,7 @@ static int __devinit mc13783_leds_prepare(struct platform_device *pdev)
         if (pdata->flags & MC13783_LED_SLEWLIMBL)
                 reg |= MC13783_LED_Cx_SLEWLIM_BIT;
 
-        ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_2, reg);
+        ret = mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_2, reg);
         if (ret)
                 goto out;
 
@@ -216,7 +216,7 @@ static int __devinit mc13783_leds_prepare(struct platform_device *pdev)
         if (pdata->flags & MC13783_LED_TRIODE_TC1)
                 reg |= MC13783_LED_Cx_TRIODE_TC_BIT;
 
-        ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_3, reg);
+        ret = mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_3, reg);
         if (ret)
                 goto out;
 
@@ -226,7 +226,7 @@ static int __devinit mc13783_leds_prepare(struct platform_device *pdev)
         if (pdata->flags & MC13783_LED_TRIODE_TC2)
                 reg |= MC13783_LED_Cx_TRIODE_TC_BIT;
 
-        ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_4, reg);
+        ret = mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_4, reg);
         if (ret)
                 goto out;
 
@@ -236,7 +236,7 @@ static int __devinit mc13783_leds_prepare(struct platform_device *pdev)
         if (pdata->flags & MC13783_LED_TRIODE_TC3)
                 reg |= MC13783_LED_Cx_TRIODE_TC_BIT;
 
-        ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_5, reg);
+        ret = mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_5, reg);
         if (ret)
                 goto out;
 
@@ -255,17 +255,17 @@ static int __devinit mc13783_leds_prepare(struct platform_device *pdev)
         reg |= (pdata->abref & MC13783_LED_C0_ABREF_MASK) <<
                                                         MC13783_LED_C0_ABREF;
 
-        ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_0, reg);
+        ret = mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_0, reg);
 
 out:
-        mc13783_unlock(dev);
+        mc13xxx_unlock(dev);
         return ret;
 }
 
 static int __devinit mc13783_led_probe(struct platform_device *pdev)
 {
-        struct mc13783_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
-        struct mc13783_led_platform_data *led_cur;
+        struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
+        struct mc13xxx_led_platform_data *led_cur;
         struct mc13783_led *led, *led_dat;
         int ret, i;
         int init_led = 0;
@@ -351,9 +351,9 @@ err_free:
 
 static int __devexit mc13783_led_remove(struct platform_device *pdev)
 {
-        struct mc13783_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
+        struct mc13xxx_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
         struct mc13783_led *led = platform_get_drvdata(pdev);
-        struct mc13783 *dev = dev_get_drvdata(pdev->dev.parent);
+        struct mc13xxx *dev = dev_get_drvdata(pdev->dev.parent);
         int i;
 
         for (i = 0; i < pdata->num_leds; i++) {
@@ -361,16 +361,16 @@ static int __devexit mc13783_led_remove(struct platform_device *pdev)
                 cancel_work_sync(&led[i].work);
         }
 
-        mc13783_lock(dev);
+        mc13xxx_lock(dev);
 
-        mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_0, 0);
-        mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_1, 0);
-        mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_2, 0);
-        mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_3, 0);
-        mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_4, 0);
-        mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_5, 0);
+        mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_0, 0);
+        mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_1, 0);
+        mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_2, 0);
+        mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_3, 0);
+        mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_4, 0);
+        mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_5, 0);
 
-        mc13783_unlock(dev);
+        mc13xxx_unlock(dev);
 
         kfree(led);
         return 0;