Merge tag 'mfd-3.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 5b58be48bfef779731fd29bc1bdc8f934e0e310f..e129c820df7da7d6430e62891558f92cdbe235ab 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -175,6 +175,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.
@@ -440,7 +441,7 @@ config MFD_MAX8925
        select MFD_CORE
        help
          Say yes here to support for Maxim Semiconductor MAX8925. This is
-         a Power Management IC. This driver provies common support for
+         a Power Management IC. This driver provides common support for
          accessing the device, additional drivers must be enabled in order
          to use the functionality of the device.
 
@@ -463,7 +464,7 @@ config MFD_MAX8998
        help
          Say yes here to support for Maxim Semiconductor MAX8998 and
          National Semiconductor LP3974. This is a Power Management IC.
-         This driver provies common support for accessing the device,
+         This driver provides common support for accessing the device,
          additional drivers must be enabled in order to use the functionality
          of the device.
 
@@ -474,7 +475,7 @@ config MFD_S5M_CORE
        select REGMAP_I2C
        help
         Support for the Samsung Electronics S5M MFD series.
-        This driver provies common support for accessing the device,
+        This driver provides common support for accessing the device,
         additional drivers must be enabled in order to use the functionality
         of the device
 
@@ -691,23 +692,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 && MFD_DB8500_PRCMU
@@ -754,16 +738,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
@@ -946,6 +920,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