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, 2 insertions, 59 deletions

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