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

1 files changed, 53 insertions, 0 deletions

diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index b03be1d4e0ca..5d6ba132837e 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -217,6 +217,47 @@ static int wm8994_suspend(struct device *dev)
                 return 0;
         }
 
+        ret = wm8994_reg_read(wm8994, WM8994_POWER_MANAGEMENT_4);
+        if (ret < 0) {
+                dev_err(dev, "Failed to read power status: %d\n", ret);
+        } else if (ret & (WM8994_AIF2ADCL_ENA | WM8994_AIF2ADCR_ENA |
+                          WM8994_AIF1ADC2L_ENA | WM8994_AIF1ADC2R_ENA |
+                          WM8994_AIF1ADC1L_ENA | WM8994_AIF1ADC1R_ENA)) {
+                dev_dbg(dev, "CODEC still active, ignoring suspend\n");
+                return 0;
+        }
+
+        ret = wm8994_reg_read(wm8994, WM8994_POWER_MANAGEMENT_5);
+        if (ret < 0) {
+                dev_err(dev, "Failed to read power status: %d\n", ret);
+        } else if (ret & (WM8994_AIF2DACL_ENA | WM8994_AIF2DACR_ENA |
+                          WM8994_AIF1DAC2L_ENA | WM8994_AIF1DAC2R_ENA |
+                          WM8994_AIF1DAC1L_ENA | WM8994_AIF1DAC1R_ENA)) {
+                dev_dbg(dev, "CODEC still active, ignoring suspend\n");
+                return 0;
+        }
+
+        switch (wm8994->type) {
+        case WM8958:
+                ret = wm8994_reg_read(wm8994, WM8958_MIC_DETECT_1);
+                if (ret < 0) {
+                        dev_err(dev, "Failed to read power status: %d\n", ret);
+                } else if (ret & WM8958_MICD_ENA) {
+                        dev_dbg(dev, "CODEC still active, ignoring suspend\n");
+                        return 0;
+                }
+                break;
+        default:
+                break;
+        }
+
+        /* Disable LDO pulldowns while the device is suspended if we
+         * don't know that something will be driving them. */
+        if (!wm8994->ldo_ena_always_driven)
+                wm8994_set_bits(wm8994, WM8994_PULL_CONTROL_2,
+                                WM8994_LDO1ENA_PD | WM8994_LDO2ENA_PD,
+                                WM8994_LDO1ENA_PD | WM8994_LDO2ENA_PD);
+
         /* GPIO configuration state is saved here since we may be configuring
          * the GPIO alternate functions even if we're not using the gpiolib
          * driver for them.
@@ -286,6 +327,11 @@ static int wm8994_resume(struct device *dev)
         if (ret < 0)
                 dev_err(dev, "Failed to restore GPIO registers: %d\n", ret);
 
+        /* Disable LDO pulldowns while the device is active */
+        wm8994_set_bits(wm8994, WM8994_PULL_CONTROL_2,
+                        WM8994_LDO1ENA_PD | WM8994_LDO2ENA_PD,
+                        0);
+
         wm8994->suspended = false;
 
         return 0;
@@ -467,8 +513,15 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
                                                 pdata->gpio_defaults[i]);
                         }
                 }
+
+                wm8994->ldo_ena_always_driven = pdata->ldo_ena_always_driven;
         }
 
+        /* Disable LDO pulldowns while the device is active */
+        wm8994_set_bits(wm8994, WM8994_PULL_CONTROL_2,
+                        WM8994_LDO1ENA_PD | WM8994_LDO2ENA_PD,
+                        0);
+
         /* In some system designs where the regulators are not in use,
          * we can achieve a small reduction in leakage currents by
          * floating LDO outputs.  This bit makes no difference if the