Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

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

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index e166d7176d7af34d56de4b4c28e9b635e0ad80c3..ee8204cc31e916dbd344ca2c0a3a93135ab64cd5 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -67,6 +67,18 @@ config MFD_BCM590XX
        help
          Support for the BCM590xx PMUs from Broadcom
 
+config MFD_AXP20X
+       bool "X-Powers AXP20X"
+       select MFD_CORE
+       select REGMAP_I2C
+       select REGMAP_IRQ
+       depends on I2C=y
+       help
+         If you say Y here you get support for the X-Powers AXP202 and AXP209.
+         This driver include only the core APIs. You have to select individual
+         components like regulators or the PEK (Power Enable Key) under the
+         corresponding menus.
+
 config MFD_CROS_EC
        tristate "ChromeOS Embedded Controller"
        select MFD_CORE
@@ -250,6 +262,16 @@ config MFD_INTEL_MSIC
          Passage) chip. This chip embeds audio, battery, GPIO, etc.
          devices used in Intel Medfield platforms.
 
+config MFD_IPAQ_MICRO
+       bool "Atmel Micro ASIC (iPAQ h3100/h3600/h3700) Support"
+       depends on SA1100_H3100 || SA1100_H3600
+       select MFD_CORE
+       help
+         Select this to get support for the Microcontroller found in
+         the Compaq iPAQ handheld computers. This is an Atmel
+         AT90LS8535 microcontroller flashed with a special iPAQ
+         firmware using the custom protocol implemented in this driver.
+
 config MFD_JANZ_CMODIO
        tristate "Janz CMOD-IO PCI MODULbus Carrier Board"
        select MFD_CORE
@@ -720,6 +742,14 @@ config MFD_STA2X11
        select MFD_CORE
        select REGMAP_MMIO
 
+config MFD_SUN6I_PRCM
+       bool "Allwinner A31 PRCM controller"
+       depends on ARCH_SUNXI
+       select MFD_CORE
+       help
+         Support for the PRCM (Power/Reset/Clock Management) unit available
+         in A31 SoC.
+
 config MFD_SYSCON
        bool "System Controller Register R/W Based on Regmap"
        select REGMAP_MMIO
@@ -1228,12 +1258,17 @@ config MCP_UCB1200_TS
 
 endmenu
 
-config VEXPRESS_CONFIG
-       bool "ARM Versatile Express platform infrastructure"
-       depends on ARM || ARM64
+config MFD_VEXPRESS_SYSREG
+       bool "Versatile Express System Registers"
+       depends on VEXPRESS_CONFIG && GPIOLIB
+       default y
+       select CLKSRC_MMIO
+       select GPIO_GENERIC_PLATFORM
+       select MFD_CORE
+       select MFD_SYSCON
        help
-         Platform configuration infrastructure for the ARM Ltd.
-         Versatile Express.
+         System Registers are the platform configuration block
+         on the ARM Ltd. Versatile Express board.
 
 endmenu
 endif