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

Pull MFD changes from Samuel Ortiz:
 - 4 new drivers: Freescale i.MX on-chip Anatop, Ricoh's RC5T583 and
   TI's TPS65090 and TPS65217.
 - New variants support (8420, 8520 ab9540), cleanups and bug fixes for
   the abx500 and db8500 ST-E chipsets.
 - Some minor fixes and update for the wm8994 from Mark.
 - The beginning of a long term TWL cleanup effort coming from the TI
   folks.
 - Various fixes and cleanups for the s5m, TPS659xx, pm860x, and MAX8997
   drivers.

Fix up trivial conflicts due to duplicate patches and header file
cleanups (<linux/device.h> removal etc).

* tag 'mfd_3.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (97 commits)
  gpio/twl: Add DT support to gpio-twl4030 driver
  gpio/twl: Allocate irq_desc dynamically for SPARSE_IRQ support
  mfd: Detach twl6040 from the pmic mfd driver
  mfd: Replace twl-* pr_ macros by the dev_ equivalent and do various cleanups
  mfd: Micro-optimization on twl4030 IRQ handler
  mfd: Make twl4030 SIH SPARSE_IRQ capable
  mfd: Move twl-core IRQ allocation into twl[4030|6030]-irq files
  mfd: Remove references already defineid in header file from twl-core
  mfd: Remove unneeded header from twl-core
  mfd: Make twl-core not depend on pdata->irq_base/end
  ARM: OMAP2+: board-omap4-*: Do not use anymore TWL6030_IRQ_BASE in board files
  mfd: Return twl6030_mmc_card_detect IRQ for board setup
  Revert "mfd: Add platform data for MAX8997 haptic driver"
  mfd: Add support for TPS65090
  mfd: Add some da9052-i2c section annotations
  mfd: Build rtc5t583 only if I2C config is selected to y.
  mfd: Add anatop mfd driver
  mfd: Fix compilation error in tps65910.h
  mfd: Add 8420 variant to db8500-prcmu
  mfd: Add 8520 PRCMU variant to db8500-prcmu
  ...

1 files changed, 69 insertions, 1 deletions

diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h
index 76579f964a2..7bd73bbdfd1 100644
--- a/include/linux/regulator/ab8500.h
+++ b/include/linux/regulator/ab8500.h
@@ -26,7 +26,26 @@ enum ab8500_regulator_id {
         AB8500_NUM_REGULATORS,
 };
 
-/* AB8500 register initialization */
+/* AB9450 regulators */
+enum ab9540_regulator_id {
+        AB9540_LDO_AUX1,
+        AB9540_LDO_AUX2,
+        AB9540_LDO_AUX3,
+        AB9540_LDO_AUX4,
+        AB9540_LDO_INTCORE,
+        AB9540_LDO_TVOUT,
+        AB9540_LDO_USB,
+        AB9540_LDO_AUDIO,
+        AB9540_LDO_ANAMIC1,
+        AB9540_LDO_ANAMIC2,
+        AB9540_LDO_DMIC,
+        AB9540_LDO_ANA,
+        AB9540_SYSCLKREQ_2,
+        AB9540_SYSCLKREQ_4,
+        AB9540_NUM_REGULATORS,
+};
+
+/* AB8500 and AB9540 register initialization */
 struct ab8500_regulator_reg_init {
         int id;
         u8 value;
@@ -71,4 +90,53 @@ enum ab8500_regulator_reg {
         AB8500_NUM_REGULATOR_REGISTERS,
 };
 
+
+/* AB9540 registers */
+enum ab9540_regulator_reg {
+        AB9540_REGUREQUESTCTRL1,
+        AB9540_REGUREQUESTCTRL2,
+        AB9540_REGUREQUESTCTRL3,
+        AB9540_REGUREQUESTCTRL4,
+        AB9540_REGUSYSCLKREQ1HPVALID1,
+        AB9540_REGUSYSCLKREQ1HPVALID2,
+        AB9540_REGUHWHPREQ1VALID1,
+        AB9540_REGUHWHPREQ1VALID2,
+        AB9540_REGUHWHPREQ2VALID1,
+        AB9540_REGUHWHPREQ2VALID2,
+        AB9540_REGUSWHPREQVALID1,
+        AB9540_REGUSWHPREQVALID2,
+        AB9540_REGUSYSCLKREQVALID1,
+        AB9540_REGUSYSCLKREQVALID2,
+        AB9540_REGUVAUX4REQVALID,
+        AB9540_REGUMISC1,
+        AB9540_VAUDIOSUPPLY,
+        AB9540_REGUCTRL1VAMIC,
+        AB9540_VSMPS1REGU,
+        AB9540_VSMPS2REGU,
+        AB9540_VSMPS3REGU, /* NOTE! PRCMU register */
+        AB9540_VPLLVANAREGU,
+        AB9540_EXTSUPPLYREGU,
+        AB9540_VAUX12REGU,
+        AB9540_VRF1VAUX3REGU,
+        AB9540_VSMPS1SEL1,
+        AB9540_VSMPS1SEL2,
+        AB9540_VSMPS1SEL3,
+        AB9540_VSMPS2SEL1,
+        AB9540_VSMPS2SEL2,
+        AB9540_VSMPS2SEL3,
+        AB9540_VSMPS3SEL1, /* NOTE! PRCMU register */
+        AB9540_VSMPS3SEL2, /* NOTE! PRCMU register */
+        AB9540_VAUX1SEL,
+        AB9540_VAUX2SEL,
+        AB9540_VRF1VAUX3SEL,
+        AB9540_REGUCTRL2SPARE,
+        AB9540_VAUX4REQCTRL,
+        AB9540_VAUX4REGU,
+        AB9540_VAUX4SEL,
+        AB9540_REGUCTRLDISCH,
+        AB9540_REGUCTRLDISCH2,
+        AB9540_REGUCTRLDISCH3,
+        AB9540_NUM_REGULATOR_REGISTERS,
+};
+
 #endif