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 60cef41b0af49889c5f1d20312e9640c37d60854..ee8204cc31e916dbd344ca2c0a3a93135ab64cd5 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -1258,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