Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[profile/ivi/kernel-x86-ivi.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 11e4438..49ef8b0 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -162,6 +162,7 @@ config MFD_TPS6586X
        bool "TPS6586x Power Management chips"
        depends on I2C=y && GPIOLIB && GENERIC_HARDIRQS
        select MFD_CORE
+       depends on REGULATOR
        help
          If you say yes here you get support for the TPS6586X series of
          Power Management chips.
@@ -376,6 +377,7 @@ config PMIC_DA9052
 
 config MFD_DA9052_SPI
        bool "Support Dialog Semiconductor DA9052/53 PMIC variants with SPI"
+       select IRQ_DOMAIN
        select REGMAP_SPI
        select REGMAP_IRQ
        select PMIC_DA9052
@@ -388,6 +390,7 @@ config MFD_DA9052_SPI
 
 config MFD_DA9052_I2C
        bool "Support Dialog Semiconductor DA9052/53 PMIC variants with I2C"
+       select IRQ_DOMAIN
        select REGMAP_I2C
        select REGMAP_IRQ
        select PMIC_DA9052
@@ -558,6 +561,7 @@ config MFD_WM8994
        bool "Support Wolfson Microelectronics WM8994"
        select MFD_CORE
        select REGMAP_I2C
+       select IRQ_DOMAIN
        select REGMAP_IRQ
        depends on I2C=y && GENERIC_HARDIRQS
        help
@@ -648,23 +652,6 @@ config EZX_PCAP
          This enables the PCAP ASIC present on EZX Phones. This is
          needed for MMC, TouchScreen, Sound, USB, etc..
 
-config AB5500_CORE
-       bool "ST-Ericsson AB5500 Mixed Signal Power Management chip"
-       depends on ABX500_CORE && MFD_DB5500_PRCMU
-       select MFD_CORE
-       help
-         Select this option to enable access to AB5500 power management
-         chip. This connects to the db5500 chip via the I2C bus via PRCMU.
-         This chip embeds various other multimedia funtionalities as well.
-
-config AB5500_DEBUG
-       bool "Enable debug info via debugfs"
-       depends on AB5500_CORE && DEBUG_FS
-       default y if DEBUG_FS
-       help
-         Select this option if you want debug information from the AB5500
-         using the debug filesystem, debugfs.
-
 config AB8500_CORE
        bool "ST-Ericsson AB8500 Mixed Signal Power Management chip"
        depends on GENERIC_HARDIRQS && ABX500_CORE
@@ -711,16 +698,6 @@ config MFD_DB8500_PRCMU
          system controller running an XP70 microprocessor, which is accessed
          through a register map.
 
-config MFD_DB5500_PRCMU
-       bool "ST-Ericsson DB5500 Power Reset Control Management Unit"
-       depends on UX500_SOC_DB5500
-       select MFD_CORE
-       help
-         Select this option to enable support for the DB5500 Power Reset
-         and Control Management Unit. This is basically an autonomous
-         system controller running an XP70 microprocessor, which is accessed
-         through a register map.
-
 config MFD_CS5535
        tristate "Support for CS5535 and CS5536 southbridge core functions"
        select MFD_CORE
@@ -888,6 +865,16 @@ config MFD_ANATOP
          MFD controller. This controller embeds regulator and
          thermal devices for Freescale i.MX platforms.
 
+config MFD_PALMAS
+       bool "Support for the TI Palmas series chips"
+       select MFD_CORE
+       select REGMAP_I2C
+       select REGMAP_IRQ
+       depends on I2C=y
+       help
+         If you say yes here you get support for the Palmas
+         series of PMIC chips from Texas Instruments.
+
 endmenu
 endif