Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 8c3b308cfda307f18a99af127cbe90c652fdca3b..33834120d057117f5b98284227ee0e3ec59df371 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -59,6 +59,14 @@ config MFD_AAT2870_CORE
          additional drivers must be enabled in order to use the
          functionality of the device.
 
+config MFD_BCM590XX
+       tristate "Broadcom BCM590xx PMUs"
+       select MFD_CORE
+       select REGMAP_I2C
+       depends on I2C
+       help
+         Support for the BCM590xx PMUs from Broadcom
+
 config MFD_CROS_EC
        tristate "ChromeOS Embedded Controller"
        select MFD_CORE
@@ -327,6 +335,7 @@ config MFD_MAX14577
        depends on I2C=y
        select MFD_CORE
        select REGMAP_I2C
+       select REGMAP_IRQ
        select IRQ_DOMAIN
        help
          Say yes here to add support for Maxim Semiconductor MAX14577.
@@ -478,7 +487,7 @@ config MFD_PM8XXX
 
 config MFD_PM8921_CORE
        tristate "Qualcomm PM8921 PMIC chip"
-       depends on (ARCH_MSM || HEXAGON)
+       depends on (ARM || HEXAGON)
        select IRQ_DOMAIN
        select MFD_CORE
        select MFD_PM8XXX
@@ -780,17 +789,6 @@ config MFD_PALMAS
          If you say yes here you get support for the Palmas
          series of PMIC chips from Texas Instruments.
 
-config MFD_TI_SSP
-       tristate "TI Sequencer Serial Port support"
-       depends on ARCH_DAVINCI_TNETV107X
-       select MFD_CORE
-       ---help---
-         Say Y here if you want support for the Sequencer Serial Port
-         in a Texas Instruments TNETV107X SoC.
-
-         To compile this driver as a module, choose M here: the
-         module will be called ti-ssp.
-
 config TPS6105X
        tristate "TI TPS61050/61052 Boost Converters"
        depends on I2C
@@ -864,6 +862,7 @@ config MFD_TPS65218
        depends on I2C
        select MFD_CORE
        select REGMAP_I2C
+       select REGMAP_IRQ
        help
          If you say yes here you get support for the TPS65218 series of
          Power Management chips.