Merge branch 'for-3.11/drivers' of git://git.kernel.dk/linux-block

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index d54e985..aecd6dd 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -53,7 +53,7 @@ config MFD_CROS_EC
        help
          If you say Y here you get support for the ChromeOS Embedded
          Controller (EC) providing keyboard, battery and power services.
-         You also ned to enable the driver for the bus you are using. The
+         You also need to enable the driver for the bus you are using. The
          protocol for talking to the EC is defined by the bus driver.
 
 config MFD_CROS_EC_I2C
@@ -242,6 +242,27 @@ config MFD_JZ4740_ADC
          Say yes here if you want support for the ADC unit in the JZ4740 SoC.
          This driver is necessary for jz4740-battery and jz4740-hwmon driver.
 
+config MFD_KEMPLD
+       tristate "Kontron module PLD device"
+       select MFD_CORE
+       help
+         This is the core driver for the PLD (Programmable Logic Device) found
+         on some Kontron ETX and COMexpress (ETXexpress) modules. The PLD
+         device may provide functions like watchdog, GPIO, UART and I2C bus.
+
+         The following modules are supported:
+               * COMe-bIP#
+               * COMe-bPC2 (ETXexpress-PC)
+               * COMe-bSC# (ETXexpress-SC T#)
+               * COMe-cCT6
+               * COMe-cDC2 (microETXexpress-DC)
+               * COMe-cPC2 (microETXexpress-PC)
+               * COMe-mCT10
+               * ETX-OH
+
+         This driver can also be built as a module. If so, the module
+         will be called kempld-core.
+
 config MFD_88PM800
        tristate "Marvell 88PM800"
        depends on I2C=y && GENERIC_HARDIRQS
@@ -342,6 +363,7 @@ config MFD_MAX8998
        bool "Maxim Semiconductor MAX8998/National LP3974 PMIC Support"
        depends on I2C=y && GENERIC_HARDIRQS
        select MFD_CORE
+       select IRQ_DOMAIN
        help
          Say yes here to support for Maxim Semiconductor MAX8998 and
          National Semiconductor LP3974. This is a Power Management IC.
@@ -419,7 +441,8 @@ config MFD_PM8XXX
 
 config MFD_PM8921_CORE
        tristate "Qualcomm PM8921 PMIC chip"
-       depends on SSBI && BROKEN
+       depends on (ARCH_MSM || HEXAGON)
+       depends on BROKEN
        select MFD_CORE
        select MFD_PM8XXX
        help
@@ -1046,6 +1069,12 @@ config MFD_WM5110
        help
          Support for Wolfson Microelectronics WM5110 low power audio SoC
 
+config MFD_WM8997
+       bool "Support Wolfson Microelectronics WM8997"
+       depends on MFD_ARIZONA
+       help
+         Support for Wolfson Microelectronics WM8997 low power audio SoC
+
 config MFD_WM8400
        bool "Wolfson Microelectronics WM8400"
        select MFD_CORE
@@ -1144,7 +1173,8 @@ config MCP_UCB1200_TS
 endmenu
 
 config VEXPRESS_CONFIG
-       bool
+       bool "ARM Versatile Express platform infrastructure"
+       depends on ARM || ARM64
        help
          Platform configuration infrastructure for the ARM Ltd.
          Versatile Express.