Merge branch 'acpi-pm'

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

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 653815950aa2416b277718df69213545573aa557..076f593f90d3285ada8fc82c2899eadbd7bf12a1 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -115,7 +115,7 @@ config MFD_CROS_EC_I2C
 
 config MFD_CROS_EC_SPI
        tristate "ChromeOS Embedded Controller (SPI)"
-       depends on MFD_CROS_EC && CROS_EC_PROTO && SPI && OF
+       depends on MFD_CROS_EC && CROS_EC_PROTO && SPI
 
        ---help---
          If you say Y here, you get support for talking to the ChromeOS EC
@@ -328,6 +328,29 @@ config INTEL_SOC_PMIC
          thermal, charger and related power management functions
          on these systems.
 
+config MFD_INTEL_LPSS
+       tristate
+       select COMMON_CLK
+       select MFD_CORE
+
+config MFD_INTEL_LPSS_ACPI
+       tristate "Intel Low Power Subsystem support in ACPI mode"
+       select MFD_INTEL_LPSS
+       depends on X86 && ACPI
+       help
+         This driver supports Intel Low Power Subsystem (LPSS) devices such as
+         I2C, SPI and HS-UART starting from Intel Sunrisepoint (Intel Skylake
+         PCH) in ACPI mode.
+
+config MFD_INTEL_LPSS_PCI
+       tristate "Intel Low Power Subsystem support in PCI mode"
+       select MFD_INTEL_LPSS
+       depends on X86 && PCI
+       help
+         This driver supports Intel Low Power Subsystem (LPSS) devices such as
+         I2C, SPI and HS-UART starting from Intel Sunrisepoint (Intel Skylake
+         PCH) in PCI mode.
+
 config MFD_INTEL_MSIC
        bool "Intel MSIC"
        depends on INTEL_SCU_IPC