Merge tag 'rtc-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

[sfrench/cifs-2.6.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 42fb90ae3345c1c2cb29c8f43c58d8df98839416..fc5e4fef89d222aa587473634bf056d9dee39578 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -133,6 +133,20 @@ config MFD_BCM590XX
        help
          Support for the BCM590xx PMUs from Broadcom
 
+config MFD_BD9571MWV
+       tristate "ROHM BD9571MWV PMIC"
+       select MFD_CORE
+       select REGMAP_I2C
+       select REGMAP_IRQ
+       depends on I2C
+       help
+         Support for the ROHM BD9571MWV PMIC, which contains single
+         voltage regulator, voltage sampling units, GPIO block and
+         watchdog block.
+
+         This driver can also be built as a module. If so, the module
+         will be called bd9571mwv.
+
 config MFD_AC100
        tristate "X-Powers AC100"
        select MFD_CORE
@@ -453,12 +467,12 @@ config LPC_SCH
 
 config INTEL_SOC_PMIC
        bool "Support for Crystal Cove PMIC"
-       depends on HAS_IOMEM && I2C=y && GPIOLIB && COMMON_CLK
+       depends on ACPI && HAS_IOMEM && I2C=y && GPIOLIB && COMMON_CLK
        depends on X86 || COMPILE_TEST
        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ
-       select I2C_DESIGNWARE_PLATFORM if ACPI
+       select I2C_DESIGNWARE_PLATFORM
        help
          Select this option to enable support for Crystal Cove PMIC
          on some Intel SoC systems. The PMIC provides ADC, GPIO,
@@ -481,7 +495,7 @@ config INTEL_SOC_PMIC_BXTWC
          on these systems.
 
 config INTEL_SOC_PMIC_CHTWC
-       tristate "Support for Intel Cherry Trail Whiskey Cove PMIC"
+       bool "Support for Intel Cherry Trail Whiskey Cove PMIC"
        depends on ACPI && HAS_IOMEM && I2C=y && COMMON_CLK
        depends on X86 || COMPILE_TEST
        select MFD_CORE
@@ -1338,6 +1352,24 @@ config MFD_TPS65217
          This driver can also be built as a module.  If so, the module
          will be called tps65217.
 
+config MFD_TPS68470
+       bool "TI TPS68470 Power Management / LED chips"
+       depends on ACPI && I2C=y
+       select MFD_CORE
+       select REGMAP_I2C
+       select I2C_DESIGNWARE_PLATFORM
+       help
+         If you say yes here you get support for the TPS68470 series of
+         Power Management / LED chips.
+
+         These include voltage regulators, LEDs and other features
+         that are often used in portable devices.
+
+         This option is a bool as it provides an ACPI operation
+         region, which must be available before any of the devices
+         using this are probed. This option also configures the
+         designware-i2c driver to be built-in, for the same reason.
+
 config MFD_TI_LP873X
        tristate "TI LP873X Power Management IC"
        depends on I2C