Merge tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

Pull MFS update from Samuel Ortiz:
 "This is the MFD patch set for the 3.8 merge window.

  We have several new drivers, most of the time coming with their sub
  devices drivers:

   - Austria Microsystem's AS3711
   - Nano River's viperboard
   - TI's TPS80031, AM335x TS/ADC,
   - Realtek's MMC/memstick card reader
   - Nokia's retu

  We also got some notable cleanups and improvements:

   - tps6586x got converted to IRQ domains.
   - tps65910 and tps65090 moved to the regmap IRQ API.
   - STMPE is now Device Tree aware.
   - A general twl6040 and twl-core cleanup, with moves to the regmap
     I/O and IRQ APIs and a conversion to the recently added PWM
     framework.
   - sta2x11 gained regmap support.

  Then the rest is mostly tiny cleanups and fixes, among which we have
  Mark's wm5xxx and wm8xxx patchset."

Far amount of annoying but largely trivial conflicts.  Many due to
__devinit/exit removal, others due to one or two of the new drivers also
having come in through another tree.

* tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (119 commits)
  mfd: tps6507x: Convert to devm_kzalloc
  mfd: stmpe: Update DT support for stmpe driver
  mfd: wm5102: Add readback of DSP status 3 register
  mfd: arizona: Log if we fail to create the primary IRQ domain
  mfd: tps80031: MFD_TPS80031 needs to select REGMAP_IRQ
  mfd: tps80031: Add terminating entry for tps80031_id_table
  mfd: sta2x11: Fix potential NULL pointer dereference in __sta2x11_mfd_mask()
  mfd: wm5102: Add tuning for revision B
  mfd: arizona: Defer patch initialistation until after first device boot
  mfd: tps65910: Fix wrong ack_base register
  mfd: tps65910: Remove unused data
  mfd: stmpe: Get rid of irq_invert_polarity
  mfd: ab8500-core: Fix invalid free of devm_ allocated data
  mfd: wm5102: Mark DSP memory regions as volatile
  mfd: wm5102: Correct default for LDO1_CONTROL_2
  mfd: arizona: Register haptics devices
  mfd: wm8994: Make current device behaviour the default
  mfd: tps65090: MFD_TPS65090 needs to select REGMAP_IRQ
  mfd: Fix stmpe.c build when OF is not enabled
  mfd: jz4740-adc: Use devm_kzalloc
  ...

1 files changed, 36 insertions, 37 deletions

diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index 9a5e28462324..1ff54b114efc 100644
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -39,52 +39,51 @@
  * address each module uses within a given i2c slave.
  */
 
-/* Slave 0 (i2c address 0x48) */
-#define TWL4030_MODULE_USB              0x00
-
-/* Slave 1 (i2c address 0x49) */
-#define TWL4030_MODULE_AUDIO_VOICE      0x01
-#define TWL4030_MODULE_GPIO             0x02
-#define TWL4030_MODULE_INTBR            0x03
-#define TWL4030_MODULE_PIH              0x04
-#define TWL4030_MODULE_TEST             0x05
-
-/* Slave 2 (i2c address 0x4a) */
-#define TWL4030_MODULE_KEYPAD           0x06
-#define TWL4030_MODULE_MADC             0x07
-#define TWL4030_MODULE_INTERRUPTS       0x08
-#define TWL4030_MODULE_LED              0x09
-#define TWL4030_MODULE_MAIN_CHARGE      0x0A
-#define TWL4030_MODULE_PRECHARGE        0x0B
-#define TWL4030_MODULE_PWM0             0x0C
-#define TWL4030_MODULE_PWM1             0x0D
-#define TWL4030_MODULE_PWMA             0x0E
-#define TWL4030_MODULE_PWMB             0x0F
-
-#define TWL5031_MODULE_ACCESSORY        0x10
-#define TWL5031_MODULE_INTERRUPTS       0x11
-
-/* Slave 3 (i2c address 0x4b) */
-#define TWL4030_MODULE_BACKUP           0x12
-#define TWL4030_MODULE_INT              0x13
-#define TWL4030_MODULE_PM_MASTER        0x14
-#define TWL4030_MODULE_PM_RECEIVER      0x15
-#define TWL4030_MODULE_RTC              0x16
-#define TWL4030_MODULE_SECURED_REG      0x17
+enum twl4030_module_ids {
+        TWL4030_MODULE_USB = 0,         /* Slave 0 (i2c address 0x48) */
+        TWL4030_MODULE_AUDIO_VOICE,     /* Slave 1 (i2c address 0x49) */
+        TWL4030_MODULE_GPIO,
+        TWL4030_MODULE_INTBR,
+        TWL4030_MODULE_PIH,
+
+        TWL4030_MODULE_TEST,
+        TWL4030_MODULE_KEYPAD,          /* Slave 2 (i2c address 0x4a) */
+        TWL4030_MODULE_MADC,
+        TWL4030_MODULE_INTERRUPTS,
+        TWL4030_MODULE_LED,
+
+        TWL4030_MODULE_MAIN_CHARGE,
+        TWL4030_MODULE_PRECHARGE,
+        TWL4030_MODULE_PWM0,
+        TWL4030_MODULE_PWM1,
+        TWL4030_MODULE_PWMA,
+
+        TWL4030_MODULE_PWMB,
+        TWL5031_MODULE_ACCESSORY,
+        TWL5031_MODULE_INTERRUPTS,
+        TWL4030_MODULE_BACKUP,          /* Slave 3 (i2c address 0x4b) */
+        TWL4030_MODULE_INT,
+
+        TWL4030_MODULE_PM_MASTER,
+        TWL4030_MODULE_PM_RECEIVER,
+        TWL4030_MODULE_RTC,
+        TWL4030_MODULE_SECURED_REG,
+        TWL4030_MODULE_LAST,
+};
 
+/* Similar functionalities implemented in TWL4030/6030 */
 #define TWL_MODULE_USB          TWL4030_MODULE_USB
-#define TWL_MODULE_AUDIO_VOICE  TWL4030_MODULE_AUDIO_VOICE
 #define TWL_MODULE_PIH          TWL4030_MODULE_PIH
-#define TWL_MODULE_MADC         TWL4030_MODULE_MADC
 #define TWL_MODULE_MAIN_CHARGE  TWL4030_MODULE_MAIN_CHARGE
 #define TWL_MODULE_PM_MASTER    TWL4030_MODULE_PM_MASTER
 #define TWL_MODULE_PM_RECEIVER  TWL4030_MODULE_PM_RECEIVER
 #define TWL_MODULE_RTC          TWL4030_MODULE_RTC
 #define TWL_MODULE_PWM          TWL4030_MODULE_PWM0
+#define TWL_MODULE_LED          TWL4030_MODULE_LED
 
-#define TWL6030_MODULE_ID0      0x0D
-#define TWL6030_MODULE_ID1      0x0E
-#define TWL6030_MODULE_ID2      0x0F
+#define TWL6030_MODULE_ID0      13
+#define TWL6030_MODULE_ID1      14
+#define TWL6030_MODULE_ID2      15
 
 #define GPIO_INTR_OFFSET        0
 #define KEYPAD_INTR_OFFSET      1