1 files changed, 67 insertions, 9 deletions

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index f4b4dad7739..e129c820df7 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -106,6 +106,19 @@ config UCB1400_CORE
           To compile this driver as a module, choose M here: the
           module will be called ucb1400_core.
 
+config MFD_LM3533
+        tristate "LM3533 Lighting Power chip"
+        depends on I2C
+        select MFD_CORE
+        select REGMAP_I2C
+        help
+          Say yes here to enable support for National Semiconductor / TI
+          LM3533 Lighting Power chips.
+
+          This driver provides common support for accessing the device;
+          additional drivers must be enabled in order to use the LED,
+          backlight or ambient-light-sensor functionality of the device.
+
 config TPS6105X
         tristate "TPS61050/61052 Boost Converters"
         depends on I2C
@@ -177,8 +190,8 @@ config MFD_TPS65910
         bool "TPS65910 Power Management chip"
         depends on I2C=y && GPIOLIB
         select MFD_CORE
-        select GPIO_TPS65910
         select REGMAP_I2C
+        select IRQ_DOMAIN
         help
           if you say yes here you get support for the TPS65910 series of
           Power Management chips.
@@ -409,6 +422,19 @@ config PMIC_ADP5520
           individual components like LCD backlight, LEDs, GPIOs and Kepad
           under the corresponding menus.
 
+config MFD_MAX77693
+        bool "Maxim Semiconductor MAX77693 PMIC Support"
+        depends on I2C=y && GENERIC_HARDIRQS
+        select MFD_CORE
+        select REGMAP_I2C
+        help
+          Say yes here to support for Maxim Semiconductor MAX77693.
+          This is a companion Power Management IC with Flash, Haptic, Charger,
+          and MUIC(Micro USB Interface Controller) controls on chip.
+          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_MAX8925
         bool "Maxim Semiconductor MAX8925 PMIC Support"
         depends on I2C=y && GENERIC_HARDIRQS
@@ -454,9 +480,9 @@ config MFD_S5M_CORE
          of the device
 
 config MFD_WM8400
-        tristate "Support Wolfson Microelectronics WM8400"
+        bool "Support Wolfson Microelectronics WM8400"
         select MFD_CORE
-        depends on I2C
+        depends on I2C=y
         select REGMAP_I2C
         help
           Support for the Wolfson Microelecronics WM8400 PMIC and audio
@@ -473,6 +499,7 @@ config MFD_WM831X_I2C
         select MFD_CORE
         select MFD_WM831X
         select REGMAP_I2C
+        select IRQ_DOMAIN
         depends on I2C=y && GENERIC_HARDIRQS
         help
           Support for the Wolfson Microelecronics WM831x and WM832x PMICs
@@ -485,6 +512,7 @@ config MFD_WM831X_SPI
         select MFD_CORE
         select MFD_WM831X
         select REGMAP_SPI
+        select IRQ_DOMAIN
         depends on SPI_MASTER && GENERIC_HARDIRQS
         help
           Support for the Wolfson Microelecronics WM831x and WM832x PMICs
@@ -597,17 +625,32 @@ config MFD_MC13783
         tristate
 
 config MFD_MC13XXX
-        tristate "Support Freescale MC13783 and MC13892"
-        depends on SPI_MASTER
+        tristate
+        depends on SPI_MASTER || I2C
         select MFD_CORE
         select MFD_MC13783
         help
-          Support for the Freescale (Atlas) PMIC and audio CODECs
-          MC13783 and MC13892.
-          This driver provides common support for accessing  the device,
+          Enable support for the Freescale MC13783 and MC13892 PMICs.
+          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_MC13XXX_SPI
+        tristate "Freescale MC13783 and MC13892 SPI interface"
+        depends on SPI_MASTER
+        select REGMAP_SPI
+        select MFD_MC13XXX
+        help
+          Select this if your MC13xxx is connected via an SPI bus.
+
+config MFD_MC13XXX_I2C
+        tristate "Freescale MC13892 I2C interface"
+        depends on I2C
+        select REGMAP_I2C
+        select MFD_MC13XXX
+        help
+          Select this if your MC13xxx is connected via an I2C bus.
+
 config ABX500_CORE
         bool "ST-Ericsson ABX500 Mixed Signal Circuit register functions"
         default y if ARCH_U300 || ARCH_U8500
@@ -651,7 +694,7 @@ config EZX_PCAP
 
 config AB8500_CORE
         bool "ST-Ericsson AB8500 Mixed Signal Power Management chip"
-        depends on GENERIC_HARDIRQS && ABX500_CORE
+        depends on GENERIC_HARDIRQS && ABX500_CORE && MFD_DB8500_PRCMU
         select MFD_CORE
         help
           Select this option to enable access to AB8500 power management
@@ -722,6 +765,16 @@ config LPC_SCH
           LPC bridge function of the Intel SCH provides support for
           System Management Bus and General Purpose I/O.
 
+config LPC_ICH
+        tristate "Intel ICH LPC"
+        depends on PCI
+        select MFD_CORE
+        help
+          The LPC bridge function of the Intel ICH provides support for
+          many functional units. This driver provides needed support for
+          other drivers to control these functions, currently GPIO and
+          watchdog.
+
 config MFD_RDC321X
         tristate "Support for RDC-R321x southbridge"
         select MFD_CORE
@@ -854,6 +907,11 @@ config MFD_RC5T583
           Additional drivers must be enabled in order to use the
           different functionality of the device.
 
+config MFD_STA2X11
+        bool "STA2X11 multi function device support"
+        depends on STA2X11
+        select MFD_CORE
+
 config MFD_ANATOP
         bool "Support for Freescale i.MX on-chip ANATOP controller"
         depends on SOC_IMX6Q