Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

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

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index fdc48a1655e744f4c537334498556e2327136868..30323426902e41bbf81a60e7558c8fe391d0729e 100644 (file)
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -326,84 +326,6 @@ config DA9062_THERMAL
          zone.
          Compatible with the DA9062 and DA9061 PMICs.
 
-config INTEL_POWERCLAMP
-       tristate "Intel PowerClamp idle injection driver"
-       depends on THERMAL
-       depends on X86
-       depends on CPU_SUP_INTEL
-       help
-         Enable this to enable Intel PowerClamp idle injection driver. This
-         enforce idle time which results in more package C-state residency. The
-         user interface is exposed via generic thermal framework.
-
-config X86_PKG_TEMP_THERMAL
-       tristate "X86 package temperature thermal driver"
-       depends on X86_THERMAL_VECTOR
-       select THERMAL_GOV_USER_SPACE
-       select THERMAL_WRITABLE_TRIPS
-       default m
-       help
-         Enable this to register CPU digital sensor for package temperature as
-         thermal zone. Each package will have its own thermal zone. There are
-         two trip points which can be set by user to get notifications via thermal
-         notification methods.
-
-config INTEL_SOC_DTS_IOSF_CORE
-       tristate
-       depends on X86 && PCI
-       select IOSF_MBI
-       help
-         This is becoming a common feature for Intel SoCs to expose the additional
-         digital temperature sensors (DTSs) using side band interface (IOSF). This
-         implements the common set of helper functions to register, get temperature
-         and get/set thresholds on DTSs.
-
-config INTEL_SOC_DTS_THERMAL
-       tristate "Intel SoCs DTS thermal driver"
-       depends on X86 && PCI && ACPI
-       select INTEL_SOC_DTS_IOSF_CORE
-       select THERMAL_WRITABLE_TRIPS
-       help
-         Enable this to register Intel SoCs (e.g. Bay Trail) platform digital
-         temperature sensor (DTS). These SoCs have two additional DTSs in
-         addition to DTSs on CPU cores. Each DTS will be registered as a
-         thermal zone. There are two trip points. One of the trip point can
-         be set by user mode programs to get notifications via Linux thermal
-         notification methods.The other trip is a critical trip point, which
-         was set by the driver based on the TJ MAX temperature.
-
-config INTEL_QUARK_DTS_THERMAL
-       tristate "Intel Quark DTS thermal driver"
-       depends on X86_INTEL_QUARK
-       help
-         Enable this to register Intel Quark SoC (e.g. X1000) platform digital
-         temperature sensor (DTS). For X1000 SoC, it has one on-die DTS.
-         The DTS will be registered as a thermal zone. There are two trip points:
-         hot & critical. The critical trip point default value is set by
-         underlying BIOS/Firmware.
-
-menu "ACPI INT340X thermal drivers"
-source "drivers/thermal/int340x_thermal/Kconfig"
-endmenu
-
-config INTEL_BXT_PMIC_THERMAL
-       tristate "Intel Broxton PMIC thermal driver"
-       depends on X86 && INTEL_SOC_PMIC_BXTWC && REGMAP
-       help
-         Select this driver for Intel Broxton PMIC with ADC channels monitoring
-         system temperature measurements and alerts.
-         This driver is used for monitoring the ADC channels of PMIC and handles
-         the alert trip point interrupts and notifies the thermal framework with
-         the trip point and temperature details of the zone.
-
-config INTEL_PCH_THERMAL
-       tristate "Intel PCH Thermal Reporting Driver"
-       depends on X86 && PCI
-       help
-         Enable this to support thermal reporting on certain intel PCHs.
-         Thermal reporting device will provide temperature reading,
-         programmable trip points and other information.
-
 config MTK_THERMAL
        tristate "Temperature sensor driver for mediatek SoCs"
        depends on ARCH_MEDIATEK || COMPILE_TEST
@@ -415,6 +337,11 @@ config MTK_THERMAL
          Enable this option if you want to have support for thermal management
          controller present in Mediatek SoCs
 
+menu "Intel thermal drivers"
+depends on X86 || X86_INTEL_QUARK || COMPILE_TEST
+source "drivers/thermal/intel/Kconfig"
+endmenu
+
 menu "Broadcom thermal drivers"
 depends on ARCH_BCM || ARCH_BRCMSTB || ARCH_BCM2835 || COMPILE_TEST
 source "drivers/thermal/broadcom/Kconfig"
@@ -447,17 +374,6 @@ config TANGO_THERMAL
 
 source "drivers/thermal/tegra/Kconfig"
 
-config QCOM_SPMI_TEMP_ALARM
-       tristate "Qualcomm SPMI PMIC Temperature Alarm"
-       depends on OF && SPMI && IIO
-       select REGMAP_SPMI
-       help
-         This enables a thermal sysfs driver for Qualcomm plug-and-play (QPNP)
-         PMIC devices. It shows up in sysfs as a thermal sensor with multiple
-         trip points. The temperature reported by the thermal sensor reflects the
-         real time die temperature if an ADC is present or an estimate of the
-         temperature based upon the over temperature stage value.
-
 config GENERIC_ADC_THERMAL
        tristate "Generic ADC based thermal sensor"
        depends on IIO