diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2014-10-17 14:30:58 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2014-10-17 14:30:58 +0800 |
| commit | 6ceaf58abe25e86292152005c51169796bad3407 (patch) | |
| tree | e97a032bc9dc63da9939136bd32ed5e0ad0f09bc /drivers/thermal/Kconfig | |
| parent | 9ceaa81efd1dd5ec83cf6be5a9445809583a03b6 (diff) | |
| parent | d8054749c6795073cb427465a726213d45898f68 (diff) | |
Merge branch 'int340x-thermal' of .git into next
Diffstat (limited to 'drivers/thermal/Kconfig')
| -rw-r--r-- | drivers/thermal/Kconfig | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index 2500ecc4826..9b012ff6522 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -217,21 +217,6 @@ config X86_PKG_TEMP_THERMAL two trip points which can be set by user to get notifications via thermal notification methods. -config ACPI_INT3403_THERMAL - tristate "ACPI INT3403 thermal driver" - depends on X86 && ACPI - help - Newer laptops and tablets that use ACPI may have thermal sensors - outside the core CPU/SOC for thermal safety reasons. These - temperature sensors are also exposed for the OS to use via the so - called INT3403 ACPI object. This driver will, on devices that have - such sensors, expose the temperature information from these sensors - to userspace via the normal thermal framework. This means that a wide - range of applications and GUI widgets can show this 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 INTEL_SOC_DTS_THERMAL tristate "Intel SoCs DTS thermal driver" depends on X86 && IOSF_MBI @@ -244,6 +229,30 @@ config INTEL_SOC_DTS_THERMAL notification methods.The other trip is a critical trip point, which was set by the driver based on the TJ MAX temperature. +config INT340X_THERMAL + tristate "ACPI INT340X thermal drivers" + depends on X86 && ACPI + select THERMAL_GOV_USER_SPACE + select ACPI_THERMAL_REL + select ACPI_FAN + 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 "Texas Instruments thermal drivers" source "drivers/thermal/ti-soc-thermal/Kconfig" endmenu |