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

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 243e0c663c37..29f463cc09cb 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -143,6 +143,21 @@ config TPS6507X
           This driver can also be built as a module.  If so, the module
           will be called tps6507x.
 
+config MFD_TPS65217
+        tristate "TPS65217 Power Management / White LED chips"
+        depends on I2C
+        select MFD_CORE
+        select REGMAP_I2C
+        help
+          If you say yes here you get support for the TPS65217 series of
+          Power Management / White LED chips.
+          These include voltage regulators, lithium ion/polymer battery
+          charger, wled and other features that are often used in portable
+          devices.
+
+          This driver can also be built as a module.  If so, the module
+          will be called tps65217.
+
 config MFD_TPS6586X
         bool "TPS6586x Power Management chips"
         depends on I2C=y && GPIOLIB && GENERIC_HARDIRQS
@@ -162,6 +177,7 @@ config MFD_TPS65910
         depends on I2C=y && GPIOLIB
         select MFD_CORE
         select GPIO_TPS65910
+        select REGMAP_I2C
         help
           if you say yes here you get support for the TPS65910 series of
           Power Management chips.
@@ -171,7 +187,7 @@ config MFD_TPS65912
         depends on GPIOLIB
 
 config MFD_TPS65912_I2C
-        bool "TPS95612 Power Management chip with I2C"
+        bool "TPS65912 Power Management chip with I2C"
         select MFD_CORE
         select MFD_TPS65912
         depends on I2C=y && GPIOLIB
@@ -400,7 +416,7 @@ config MFD_MAX8997
         depends on I2C=y && GENERIC_HARDIRQS
         select MFD_CORE
         help
-          Say yes here to support for Maxim Semiconductor MAX8998/8966.
+          Say yes here to support for Maxim Semiconductor MAX8997/8966.
           This is a Power Management IC with RTC, Flash, Fuel Gauge, Haptic,
           MUIC controls on chip.
           This driver provides common support for accessing the device;
@@ -812,6 +828,18 @@ config MFD_PM8XXX_IRQ
 config TPS65911_COMPARATOR
         tristate
 
+config MFD_TPS65090
+        bool "TPS65090 Power Management chips"
+        depends on I2C=y && GENERIC_HARDIRQS
+        select MFD_CORE
+        select REGMAP_I2C
+        help
+          If you say yes here you get support for the TPS65090 series of
+          Power Management chips.
+          This driver provides common support for accessing the device,
+          additional drivers must be enabled in order to use the
+          functionality of the device.
+
 config MFD_AAT2870_CORE
         bool "Support for the AnalogicTech AAT2870"
         select MFD_CORE
@@ -831,6 +859,28 @@ config MFD_INTEL_MSIC
           Passage) chip. This chip embeds audio, battery, GPIO, etc.
           devices used in Intel Medfield platforms.
 
+config MFD_RC5T583
+        bool "Ricoh RC5T583 Power Management system device"
+        depends on I2C=y && GENERIC_HARDIRQS
+        select MFD_CORE
+        select REGMAP_I2C
+        help
+          Select this option to get support for the RICOH583 Power
+          Management system device.
+          This driver provides common support for accessing the device
+          through i2c interface. The device supports multiple sub-devices
+          like GPIO, interrupts, RTC, LDO and DCDC regulators, onkey.
+          Additional drivers must be enabled in order to use the
+          different functionality of the device.
+
+config MFD_ANATOP
+        bool "Support for Freescale i.MX on-chip ANATOP controller"
+        depends on SOC_IMX6Q
+        help
+          Select this option to enable Freescale i.MX on-chip ANATOP
+          MFD controller. This controller embeds regulator and
+          thermal devices for Freescale i.MX platforms.
+
 endmenu
 endif