Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / drivers / platform / x86 / Kconfig

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index b8a21d7b25d4c34e4042caf624ac4c86211c11d0..49a594855f98f43d151e44f5d07449cba1a5b095 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -363,6 +363,18 @@ config IDEAPAD_LAPTOP
          This is a driver for Lenovo IdeaPad netbooks contains drivers for
          rfkill switch, hotkey, fan control and backlight control.
 
+config SURFACE3_WMI
+       tristate "Surface 3 WMI Driver"
+       depends on ACPI_WMI
+       depends on DMI
+       depends on INPUT
+       depends on SPI
+       ---help---
+         Say Y here if you have a Surface 3.
+
+         To compile this driver as a module, choose M here: the module will
+         be called surface3-wmi.
+
 config THINKPAD_ACPI
        tristate "ThinkPad ACPI Laptop Extras"
        depends on ACPI
@@ -804,13 +816,6 @@ config INTEL_SCU_IPC_UTIL
          low level access for debug work and updating the firmware. Say
          N unless you will be doing this on an Intel MID platform.
 
-config GPIO_INTEL_PMIC
-       bool "Intel PMIC GPIO support"
-       depends on INTEL_SCU_IPC && GPIOLIB
-       ---help---
-         Say Y here to support GPIO via the SCU IPC interface
-         on Intel MID platforms.
-
 config INTEL_MID_POWER_BUTTON
        tristate "power button driver for Intel MID platforms"
        depends on INTEL_SCU_IPC && INPUT
@@ -1005,12 +1010,27 @@ config INTEL_PMC_IPC
        The PMC is an ARC processor which defines IPC commands for communication
        with other entities in the CPU.
 
+config INTEL_BXTWC_PMIC_TMU
+       tristate "Intel BXT Whiskey Cove TMU Driver"
+       depends on REGMAP
+       depends on INTEL_SOC_PMIC && INTEL_PMC_IPC
+       ---help---
+         Select this driver to use Intel BXT Whiskey Cove PMIC TMU feature.
+         This driver enables the alarm wakeup functionality in the TMU unit
+         of Whiskey Cove PMIC.
+
 config SURFACE_PRO3_BUTTON
        tristate "Power/home/volume buttons driver for Microsoft Surface Pro 3/4 tablet"
        depends on ACPI && INPUT
        ---help---
          This driver handles the power/home/volume buttons on the Microsoft Surface Pro 3/4 tablet.
 
+config SURFACE_3_BUTTON
+       tristate "Power/home/volume buttons driver for Microsoft Surface 3 tablet"
+       depends on ACPI && KEYBOARD_GPIO && I2C
+       ---help---
+         This driver handles the power/home/volume buttons on the Microsoft Surface 3 tablet.
+
 config INTEL_PUNIT_IPC
        tristate "Intel P-Unit IPC Driver"
        ---help---
@@ -1027,4 +1047,26 @@ config INTEL_TELEMETRY
          used to get various SoC events and parameters
          directly via debugfs files. Various tools may use
          this interface for SoC state monitoring.
+
+config MLX_PLATFORM
+       tristate "Mellanox Technologies platform support"
+       depends on X86_64
+       ---help---
+         This option enables system support for the Mellanox Technologies
+         platform. The Mellanox systems provide data center networking
+         solutions based on Virtual Protocol Interconnect (VPI) technology
+         enable seamless connectivity to 56/100Gb/s InfiniBand or 10/40/56GbE
+         connection.
+
+         If you have a Mellanox system, say Y or M here.
+
+config MLX_CPLD_PLATFORM
+       tristate "Mellanox platform hotplug driver support"
+       default n
+       select HWMON
+       select I2C
+       ---help---
+         This driver handles hot-plug events for the power suppliers, power
+         cables and fans on the wide range Mellanox IB and Ethernet systems.
+
 endif # X86_PLATFORM_DEVICES