Merge branch 'cpu-package-thermal' of .git into next
Conflicts:
drivers/thermal/Kconfig
drivers/thermal/Makefile
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 7205c70..b13c2bc 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -169,7 +169,20 @@
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