summaryrefslogtreecommitdiffstats
path: root/drivers/thermal/Kconfig
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2013-06-18 06:31:26 +0800
committerZhang Rui <rui.zhang@intel.com>2013-06-18 06:31:26 +0800
commitf157f5964bdc604d8cbf0b71780a0d47ea9f7371 (patch)
tree8667f1068b026c640cae1a6cb229ca4944c8c3c7 /drivers/thermal/Kconfig
parent30072fb91e1447b00fa148500c49010265b530c6 (diff)
parent23be63f48d928cd5a21db58f73c731357e895250 (diff)
Merge branch 'cpu-package-thermal' of .git into next
Conflicts: drivers/thermal/Kconfig drivers/thermal/Makefile
Diffstat (limited to 'drivers/thermal/Kconfig')
-rw-r--r--drivers/thermal/Kconfig13
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 7205c70a46a..b13c2bcccb7 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -169,7 +169,20 @@ config INTEL_POWERCLAMP
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 THERMAL
+ depends on X86
+ select THERMAL_GOV_USER_SPACE
+ 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.
+
menu "Texas Instruments thermal drivers"
source "drivers/thermal/ti-soc-thermal/Kconfig"
endmenu
+
endif