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 d875bfa..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
@@ -861,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