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

12 files changed, 55 insertions, 75 deletions

diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c
index cfa84178eb26..ba232d79fa81 100644
--- a/arch/arm/mach-imx/mach-mx27_3ds.c
+++ b/arch/arm/mach-imx/mach-mx27_3ds.c
@@ -293,8 +293,7 @@ static struct mc13xxx_platform_data mc13783_pdata = {
                 .num_regulators = ARRAY_SIZE(mx27_3ds_regulators),
 
         },
-        .flags  = MC13783_USE_REGULATOR | MC13783_USE_TOUCHSCREEN |
-        MC13783_USE_RTC,
+        .flags  = MC13XXX_USE_TOUCHSCREEN | MC13XXX_USE_RTC,
 };
 
 /* SPI */
diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c
index 60f1fda6ce97..b8c54b840185 100644
--- a/arch/arm/mach-imx/mach-mx31_3ds.c
+++ b/arch/arm/mach-imx/mach-mx31_3ds.c
@@ -492,7 +492,7 @@ static struct mc13xxx_platform_data mc13783_pdata = {
                 .regulators = mx31_3ds_regulators,
                 .num_regulators = ARRAY_SIZE(mx31_3ds_regulators),
         },
-        .flags  = MC13783_USE_REGULATOR | MC13783_USE_TOUCHSCREEN,
+        .flags  = MC13XXX_USE_TOUCHSCREEN,
 };
 
 /* SPI */
diff --git a/arch/arm/mach-imx/mach-mx31lite.c b/arch/arm/mach-imx/mach-mx31lite.c
index c97c26d814ed..05f1c71ba409 100644
--- a/arch/arm/mach-imx/mach-mx31lite.c
+++ b/arch/arm/mach-imx/mach-mx31lite.c
@@ -112,8 +112,7 @@ static const struct spi_imx_master spi1_pdata __initconst = {
 };
 
 static struct mc13xxx_platform_data mc13783_pdata __initdata = {
-        .flags  = MC13XXX_USE_RTC |
-                  MC13XXX_USE_REGULATOR,
+        .flags = MC13XXX_USE_RTC,
 };
 
 static struct spi_board_info mc13783_spi_dev __initdata = {
diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c
index fff7791b7e7c..07034f44466a 100644
--- a/arch/arm/mach-imx/mach-mx31moboard.c
+++ b/arch/arm/mach-imx/mach-mx31moboard.c
@@ -31,6 +31,7 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/err.h>
+#include <linux/input.h>
 
 #include <linux/usb/otg.h>
 #include <linux/usb/ulpi.h>
@@ -225,7 +226,7 @@ static struct mc13xxx_regulator_init_data moboard_regulators[] = {
         },
 };
 
-static struct mc13783_led_platform_data moboard_led[] = {
+static struct mc13xxx_led_platform_data moboard_led[] = {
         {
                 .id = MC13783_LED_R1,
                 .name = "coreboard-led-4:red",
@@ -258,7 +259,7 @@ static struct mc13783_led_platform_data moboard_led[] = {
         },
 };
 
-static struct mc13783_leds_platform_data moboard_leds = {
+static struct mc13xxx_leds_platform_data moboard_leds = {
         .num_leds = ARRAY_SIZE(moboard_led),
         .led = moboard_led,
         .flags = MC13783_LED_SLEWLIMTC,
@@ -267,14 +268,20 @@ static struct mc13783_leds_platform_data moboard_leds = {
         .tc2_period = MC13783_LED_PERIOD_10MS,
 };
 
+static struct mc13xxx_buttons_platform_data moboard_buttons = {
+        .b1on_flags = MC13783_BUTTON_DBNC_750MS | MC13783_BUTTON_ENABLE |
+                        MC13783_BUTTON_POL_INVERT,
+        .b1on_key = KEY_POWER,
+};
+
 static struct mc13xxx_platform_data moboard_pmic = {
         .regulators = {
                 .regulators = moboard_regulators,
                 .num_regulators = ARRAY_SIZE(moboard_regulators),
         },
         .leds = &moboard_leds,
-        .flags = MC13XXX_USE_REGULATOR | MC13XXX_USE_RTC |
-                MC13XXX_USE_ADC | MC13XXX_USE_LED,
+        .buttons = &moboard_buttons,
+        .flags = MC13XXX_USE_RTC | MC13XXX_USE_ADC,
 };
 
 static struct spi_board_info moboard_spi_board_info[] __initdata = {
diff --git a/arch/arm/mach-imx/mach-pcm038.c b/arch/arm/mach-imx/mach-pcm038.c
index 100bc733ce93..a17e9c7dfca0 100644
--- a/arch/arm/mach-imx/mach-pcm038.c
+++ b/arch/arm/mach-imx/mach-pcm038.c
@@ -268,8 +268,7 @@ static struct mc13xxx_platform_data pcm038_pmic = {
                 .regulators = pcm038_regulators,
                 .num_regulators = ARRAY_SIZE(pcm038_regulators),
         },
-        .flags = MC13783_USE_ADC | MC13783_USE_REGULATOR |
-                 MC13783_USE_TOUCHSCREEN,
+        .flags = MC13XXX_USE_ADC | MC13XXX_USE_TOUCHSCREEN,
 };
 
 static struct spi_board_info pcm038_spi_board_info[] __initdata = {
diff --git a/arch/arm/mach-mx5/mx51_efika.c b/arch/arm/mach-mx5/mx51_efika.c
index b004e178417d..ec6ca91b299b 100644
--- a/arch/arm/mach-mx5/mx51_efika.c
+++ b/arch/arm/mach-mx5/mx51_efika.c
@@ -565,7 +565,7 @@ static struct mc13xxx_regulator_init_data mx51_efika_regulators[] = {
 };
 
 static struct mc13xxx_platform_data mx51_efika_mc13892_data = {
-        .flags = MC13XXX_USE_RTC | MC13XXX_USE_REGULATOR,
+        .flags = MC13XXX_USE_RTC,
         .regulators = {
                 .num_regulators = ARRAY_SIZE(mx51_efika_regulators),
                 .regulators = mx51_efika_regulators,
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 497e9dc27958..503414718905 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -14,7 +14,6 @@ config ARCH_OMAP2PLUS_TYPICAL
         select SERIAL_OMAP_CONSOLE
         select I2C
         select I2C_OMAP
-        select MFD_SUPPORT
         select MENELAUS if ARCH_OMAP2
         select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
         select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 70261bcda3f9..4a71cb7e42d4 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -378,7 +378,8 @@ static struct i2c_board_info __initdata beagle_i2c_eeprom[] = {
 static int __init omap3_beagle_i2c_init(void)
 {
         omap3_pmic_get_config(&beagle_twldata,
-                        TWL_COMMON_PDATA_USB | TWL_COMMON_PDATA_AUDIO,
+                        TWL_COMMON_PDATA_USB | TWL_COMMON_PDATA_MADC |
+                        TWL_COMMON_PDATA_AUDIO,
                         TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2);
 
         beagle_twldata.vpll2->constraints.name = "VDVI";
@@ -444,9 +445,15 @@ static struct platform_device keys_gpio = {
         },
 };
 
+static struct platform_device madc_hwmon = {
+        .name   = "twl4030_madc_hwmon",
+        .id     = -1,
+};
+
 static struct platform_device *omap3_beagle_devices[] __initdata = {
         &leds_gpio,
         &keys_gpio,
+        &madc_hwmon,
 };
 
 static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
diff --git a/arch/arm/mach-u300/i2c.c b/arch/arm/mach-u300/i2c.c
index f0394baa11fa..5140deeddf7b 100644
--- a/arch/arm/mach-u300/i2c.c
+++ b/arch/arm/mach-u300/i2c.c
@@ -256,57 +256,8 @@ static struct ab3100_platform_data ab3100_plf_data = {
 };
 #endif
 
-#ifdef CONFIG_AB3550_CORE
-static struct abx500_init_settings ab3550_init_settings[] = {
-        {
-                .bank = 0,
-                .reg = AB3550_IMR1,
-                .setting = 0xff
-        },
-        {
-                .bank = 0,
-                .reg = AB3550_IMR2,
-                .setting = 0xff
-        },
-        {
-                .bank = 0,
-                .reg = AB3550_IMR3,
-                .setting = 0xff
-        },
-        {
-                .bank = 0,
-                .reg = AB3550_IMR4,
-                .setting = 0xff
-        },
-        {
-                .bank = 0,
-                .reg = AB3550_IMR5,
-                /* The two most significant bits are not used */
-                .setting = 0x3f
-        },
-};
-
-static struct ab3550_platform_data ab3550_plf_data = {
-        .irq = {
-                .base = IRQ_AB3550_BASE,
-                .count = (IRQ_AB3550_END - IRQ_AB3550_BASE + 1),
-        },
-        .dev_data = {
-        },
-        .init_settings = ab3550_init_settings,
-        .init_settings_sz = ARRAY_SIZE(ab3550_init_settings),
-};
-#endif
-
 static struct i2c_board_info __initdata bus0_i2c_board_info[] = {
-#if defined(CONFIG_AB3550_CORE)
-        {
-                .type = "ab3550",
-                .addr = 0x4A,
-                .irq = IRQ_U300_IRQ0_EXT,
-                .platform_data = &ab3550_plf_data,
-        },
-#elif defined(CONFIG_AB3100_CORE)
+#ifdef CONFIG_AB3100_CORE
         {
                 .type = "ab3100",
                 .addr = 0x48,
diff --git a/arch/arm/mach-u300/include/mach/irqs.h b/arch/arm/mach-u300/include/mach/irqs.h
index d270fea32926..db3fbfa1d6e9 100644
--- a/arch/arm/mach-u300/include/mach/irqs.h
+++ b/arch/arm/mach-u300/include/mach/irqs.h
@@ -117,14 +117,6 @@
 #define IRQ_U300_GPIO_END               (U300_VIC_IRQS_END)
 #endif
 
-/* Optional AB3550 mixsig chip */
-#ifdef CONFIG_AB3550_CORE
-#define IRQ_AB3550_BASE                 (IRQ_U300_GPIO_END)
-#define IRQ_AB3550_END                  (IRQ_AB3550_BASE + 38)
-#else
-#define IRQ_AB3550_END                  (IRQ_U300_GPIO_END)
-#endif
-
-#define NR_IRQS                         (IRQ_AB3550_END)
+#define NR_IRQS                         (IRQ_U300_GPIO_END)
 
 #endif
diff --git a/arch/arm/mach-ux500/board-u5500.c b/arch/arm/mach-ux500/board-u5500.c
index e014aa749b03..82025ba70c03 100644
--- a/arch/arm/mach-ux500/board-u5500.c
+++ b/arch/arm/mach-ux500/board-u5500.c
@@ -10,6 +10,7 @@
 #include <linux/amba/bus.h>
 #include <linux/irq.h>
 #include <linux/i2c.h>
+#include <linux/mfd/ab5500/ab5500.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
@@ -87,7 +88,6 @@ static struct lm3530_platform_data u5500_als_platform_data = {
         .brt_val = 0x7F,        /* Max brightness */
 };
 
-
 static struct i2c_board_info __initdata u5500_i2c2_devices[] = {
         {
                 /* Backlight */
@@ -101,6 +101,30 @@ static void __init u5500_i2c_init(void)
         db5500_add_i2c2(&u5500_i2c2_data);
         i2c_register_board_info(2, ARRAY_AND_SIZE(u5500_i2c2_devices));
 }
+
+static struct ab5500_platform_data ab5500_plf_data = {
+        .irq = {
+                .base = 0,
+                .count = 0,
+        },
+        .init_settings = NULL,
+        .init_settings_sz = 0,
+        .pm_power_off = false,
+};
+
+static struct platform_device ab5500_device = {
+        .name = "ab5500-core",
+        .id = 0,
+        .dev = {
+                .platform_data = &ab5500_plf_data,
+        },
+        .num_resources = 0,
+};
+
+static struct platform_device *u5500_platform_devices[] __initdata = {
+        &ab5500_device,
+};
+
 static void __init u5500_uart_init(void)
 {
         db5500_add_uart0(NULL);
@@ -115,6 +139,9 @@ static void __init u5500_init_machine(void)
         u5500_i2c_init();
         u5500_sdi_init();
         u5500_uart_init();
+
+        platform_add_devices(u5500_platform_devices,
+                ARRAY_SIZE(u5500_platform_devices));
 }
 
 MACHINE_START(U5500, "ST-Ericsson U5500 Platform")
diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c
index 1405d0eb7edb..f41857494375 100644
--- a/arch/arm/mach-ux500/cpu.c
+++ b/arch/arm/mach-ux500/cpu.c
@@ -47,6 +47,6 @@ void __init ux500_init_irq(void)
         if (cpu_is_u5500())
                 db5500_prcmu_early_init();
         if (cpu_is_u8500())
-                prcmu_early_init();
+                db8500_prcmu_early_init();
         clk_init();
 }