From: Zhang Rui <rui.zhang@intel.com>
Date: Mon, 17 Jun 2013 22:31:26 +0000 (+0800)
Subject: Merge branch 'cpu-package-thermal' of .git into next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f157f5964bdc604d8cbf0b71780a0d47ea9f7371;p=linux-beck.git

Merge branch 'cpu-package-thermal' of .git into next

Conflicts:
	drivers/thermal/Kconfig
	drivers/thermal/Makefile
---

f157f5964bdc604d8cbf0b71780a0d47ea9f7371
diff --cc drivers/thermal/Kconfig
index 7205c70a46a3,245831ccda3e..b13c2bcccb72
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@@ -169,7 -169,16 +169,20 @@@ config INTEL_POWERCLAM
  	  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
diff --cc drivers/thermal/Makefile
index 85693941fda0,b1cefb8419ae..67184a293e3f
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@@ -23,4 -23,4 +23,5 @@@ obj-$(CONFIG_DB8500_THERMAL)	+= db8500_
  obj-$(CONFIG_ARMADA_THERMAL)	+= armada_thermal.o
  obj-$(CONFIG_DB8500_CPUFREQ_COOLING)	+= db8500_cpufreq_cooling.o
  obj-$(CONFIG_INTEL_POWERCLAMP)	+= intel_powerclamp.o
+ obj-$(CONFIG_X86_PKG_TEMP_THERMAL)	+= x86_pkg_temp_thermal.o
 +obj-$(CONFIG_TI_SOC_THERMAL)	+= ti-soc-thermal/