Merge branches 'ib-mfd-clk-4.6', 'ib-mfd-input-iio-4.6', 'ib-mfd-regulator-4.6' and...

[cascardo/linux.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index ae3990b..19a5cae 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -286,6 +286,15 @@ config MFD_MC13XXX_I2C
        help
          Select this if your MC13xxx is connected via an I2C bus.
 
+config MFD_MX25_TSADC
+       tristate "Freescale i.MX25 integrated Touchscreen and ADC unit"
+       select REGMAP_MMIO
+       depends on (SOC_IMX25 && OF) || COMPILE_TEST
+       help
+         Enable support for the integrated Touchscreen and ADC unit of the
+         i.MX25 processors. They consist of a conversion queue for general
+         purpose ADC and a queue for Touchscreens.
+
 config MFD_HI6421_PMIC
        tristate "HiSilicon Hi6421 PMU/Codec IC"
        depends on OF
@@ -1196,27 +1205,25 @@ config MFD_TPS65910
          Power Management chips.
 
 config MFD_TPS65912
-       bool "TI TPS65912 Power Management chip"
-       depends on GPIOLIB
+       tristate
        select MFD_CORE
-       help
-         If you say yes here you get support for the TPS65912 series of
-         PM chips.
+       select REGMAP
+       select REGMAP_IRQ
 
 config MFD_TPS65912_I2C
-       bool "TI TPS65912 Power Management chip with I2C"
-       select MFD_CORE
+       tristate "TI TPS65912 Power Management chip with I2C"
        select MFD_TPS65912
-       depends on I2C=y && GPIOLIB
+       select REGMAP_I2C
+       depends on I2C
        help
          If you say yes here you get support for the TPS65912 series of
          PM chips with I2C interface.
 
 config MFD_TPS65912_SPI
-       bool "TI TPS65912 Power Management chip with SPI"
-       select MFD_CORE
+       tristate "TI TPS65912 Power Management chip with SPI"
        select MFD_TPS65912
-       depends on SPI_MASTER && GPIOLIB
+       select REGMAP_SPI
+       depends on SPI_MASTER
        help
          If you say yes here you get support for the TPS65912 series of
          PM chips with SPI interface.