Merge tag 'selinux-pr-20191007' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index c9c49da42446b342a1d8ddfe52c00ffbb3110c19..ae24d3ea68ea434b4af0561b4cee8e3d04d5244c 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -589,6 +589,17 @@ config INTEL_SOC_PMIC_CHTDC_TI
          Select this option for supporting Dollar Cove (TI version) PMIC
          device that is found on some Intel Cherry Trail systems.
 
+config INTEL_SOC_PMIC_MRFLD
+       tristate "Support for Intel Merrifield Basin Cove PMIC"
+       depends on GPIOLIB
+       depends on ACPI
+       depends on INTEL_SCU_IPC
+       select MFD_CORE
+       select REGMAP_IRQ
+       help
+         Select this option for supporting Basin Cove PMIC device
+         that is found on Intel Merrifield systems.
+
 config MFD_INTEL_LPSS
        tristate
        select COMMON_CLK
@@ -641,15 +652,6 @@ config MFD_JANZ_CMODIO
          host many different types of MODULbus daughterboards, including
          CAN and GPIO controllers.
 
-config MFD_JZ4740_ADC
-       bool "Janz JZ4740 ADC core"
-       select MFD_CORE
-       select GENERIC_IRQ_CHIP
-       depends on MACH_JZ4740
-       help
-         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