Merge tag 'usercopy-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

[karo-tx-linux.git] / drivers / thermal / Kconfig

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 3c3dc4a3d52cfb4685bdcbd2c62b55d33447804d..2d702ca6556f5b6185a95ec007ada7b124226272 100644 (file)
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -260,16 +260,6 @@ config ARMADA_THERMAL
          Enable this option if you want to have support for thermal management
          controller present in Armada 370 and Armada XP SoC.
 
          Enable this option if you want to have support for thermal management
          controller present in Armada 370 and Armada XP SoC.
 

-config TEGRA_SOCTHERM
-       tristate "Tegra SOCTHERM thermal management"
-       depends on ARCH_TEGRA
-       help
-         Enable this option for integrated thermal management support on NVIDIA
-         Tegra124 systems-on-chip. The driver supports four thermal zones
-         (CPU, GPU, MEM, PLLX). Cooling devices can be bound to the thermal
-         zones to manage temperatures. This option is also required for the
-         emergency thermal reset (thermtrip) feature to function.
-

 config DB8500_CPUFREQ_COOLING
        tristate "DB8500 cpufreq cooling"
        depends on ARCH_U8500 || COMPILE_TEST
 config DB8500_CPUFREQ_COOLING
        tristate "DB8500 cpufreq cooling"
        depends on ARCH_U8500 || COMPILE_TEST


@@ -338,31 +328,9 @@ config INTEL_QUARK_DTS_THERMAL
          hot & critical. The critical trip point default value is set by
          underlying BIOS/Firmware.
 
          hot & critical. The critical trip point default value is set by
          underlying BIOS/Firmware.
 

-config INT340X_THERMAL
-       tristate "ACPI INT340X thermal drivers"
-       depends on X86 && ACPI
-       select THERMAL_GOV_USER_SPACE
-       select ACPI_THERMAL_REL
-       select ACPI_FAN
-       select INTEL_SOC_DTS_IOSF_CORE
-       select THERMAL_WRITABLE_TRIPS
-       help
-         Newer laptops and tablets that use ACPI may have thermal sensors and
-         other devices with thermal control capabilities outside the core
-         CPU/SOC, for thermal safety reasons.
-         They are exposed for the OS to use via the INT3400 ACPI device object
-         as the master, and INT3401~INT340B ACPI device objects as the slaves.
-         Enable this to expose the temperature information and cooling ability
-         from these objects to userspace via the normal thermal framework.
-         This means that a wide range of applications and GUI widgets can show
-         the information to the user or use this information for making
-         decisions. For example, the Intel Thermal Daemon can use this
-         information to allow the user to select his laptop to run without
-         turning on the fans.
-
-config ACPI_THERMAL_REL
-       tristate
-       depends on ACPI
+menu "ACPI INT340X thermal drivers"
+source drivers/thermal/int340x_thermal/Kconfig
+endmenu

 
 config INTEL_PCH_THERMAL
        tristate "Intel PCH Thermal Reporting Driver"
 
 config INTEL_PCH_THERMAL
        tristate "Intel PCH Thermal Reporting Driver"


@@ -399,6 +367,17 @@ depends on ARCH_STI && OF
 source "drivers/thermal/st/Kconfig"
 endmenu
 
 source "drivers/thermal/st/Kconfig"
 endmenu
 

+config TANGO_THERMAL
+       tristate "Tango thermal management"
+       depends on ARCH_TANGO || COMPILE_TEST
+       help
+         Enable the Tango thermal driver, which supports the primitive
+         temperature sensor embedded in Tango chips since the SMP8758.
+         This sensor only generates a 1-bit signal to indicate whether
+         the die temperature exceeds a programmable threshold.
+
+source "drivers/thermal/tegra/Kconfig"
+

 config QCOM_SPMI_TEMP_ALARM
        tristate "Qualcomm SPMI PMIC Temperature Alarm"
        depends on OF && SPMI && IIO
 config QCOM_SPMI_TEMP_ALARM
        tristate "Qualcomm SPMI PMIC Temperature Alarm"
        depends on OF && SPMI && IIO


@@ -410,4 +389,14 @@ config QCOM_SPMI_TEMP_ALARM
          real time die temperature if an ADC is present or an estimate of the
          temperature based upon the over temperature stage value.
 
          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
+       help
+         This enabled a thermal sysfs driver for the temperature sensor
+         which is connected to the General Purpose ADC. The ADC channel
+         is read via IIO framework and the channel information is provided
+         to this driver. This driver reports the temperature by reading ADC
+         channel and converts it to temperature based on lookup table.
+

 endif
 endif