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 e56fb3749bca168256210029444db4c93d315c24..ee8204cc31e916dbd344ca2c0a3a93135ab64cd5 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -262,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
@@ -1248,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