Merge tag 'ntb-4.2' of git://github.com/jonmason/ntb

[cascardo/linux.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index d5ad04d..6538159 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -52,7 +52,8 @@ config PMIC_ADP5520
 config MFD_AAT2870_CORE
        bool "AnalogicTech AAT2870"
        select MFD_CORE
-       depends on I2C=y && GPIOLIB
+       depends on I2C=y
+       depends on GPIOLIB || COMPILE_TEST
        help
          If you say yes here you get support for the AAT2870.
          This driver provides common support for accessing the device,
@@ -94,6 +95,8 @@ config MFD_AXP20X
 config MFD_CROS_EC
        tristate "ChromeOS Embedded Controller"
        select MFD_CORE
+       select CHROME_PLATFORMS
+       select CROS_EC_PROTO
        help
          If you say Y here you get support for the ChromeOS Embedded
          Controller (EC) providing keyboard, battery and power services.
@@ -102,7 +105,7 @@ config MFD_CROS_EC
 
 config MFD_CROS_EC_I2C
        tristate "ChromeOS Embedded Controller (I2C)"
-       depends on MFD_CROS_EC && I2C
+       depends on MFD_CROS_EC && CROS_EC_PROTO && I2C
 
        help
          If you say Y here, you get support for talking to the ChromeOS
@@ -112,7 +115,7 @@ config MFD_CROS_EC_I2C
 
 config MFD_CROS_EC_SPI
        tristate "ChromeOS Embedded Controller (SPI)"
-       depends on MFD_CROS_EC && SPI && OF
+       depends on MFD_CROS_EC && CROS_EC_PROTO && SPI && OF
 
        ---help---
          If you say Y here, you get support for talking to the ChromeOS EC
@@ -1115,7 +1118,8 @@ config MFD_TPS6586X
 
 config MFD_TPS65910
        bool "TI TPS65910 Power Management chip"
-       depends on I2C=y && GPIOLIB
+       depends on I2C=y
+       depends on GPIOLIB || COMPILE_TEST
        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ