thermal: introduce TI SoC thermal driver

This patch moves the ti-soc-thermal driver out of the staging tree to the thermal tree. Cc: Grant Likely <grant.likely@linaro.org> Cc: Rob Herring <rob.herring@calxeda.com> Cc: Rob Landley <rob@landley.net> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Zhang Rui <rui.zhang@intel.com> Cc: Eduardo Valentin <eduardo.valentin@ti.com> Cc: J Keerthy <j-keerthy@ti.com> Cc: Radhesh Fadnis <radhesh.fadnis@ti.com> Cc: Cyril Roelandt <tipecaml@gmail.com> Cc: devicetree-discuss@lists.ozlabs.org Cc: linux-doc@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: devel@driverdev.osuosl.org Cc: linux-pm@vger.kernel.org Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
mariux64 · May 28, 2013 · eb98200 · eb98200
1 parent c240a53
commit eb98200
Show file tree

Hide file tree

Showing 16 changed files with 4 additions and 4 deletions.
diff --git a/...staging/ti-soc-thermal/ti_soc_thermal.txt → ...etree/bindings/thermal/ti_soc_thermal.txt b/...staging/ti-soc-thermal/ti_soc_thermal.txt → ...etree/bindings/thermal/ti_soc_thermal.txt
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
@@ -118,8 +118,6 @@ source "drivers/staging/gdm72xx/Kconfig"
 
 source "drivers/staging/csr/Kconfig"
 
-source "drivers/staging/ti-soc-thermal/Kconfig"
-
 source "drivers/staging/silicom/Kconfig"
 
 source "drivers/staging/ced1401/Kconfig"

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
@@ -52,7 +52,6 @@ obj-$(CONFIG_ANDROID)		+= android/
 obj-$(CONFIG_USB_WPAN_HCD)	+= ozwpan/
 obj-$(CONFIG_WIMAX_GDM72XX)	+= gdm72xx/
 obj-$(CONFIG_CSR_WIFI)		+= csr/
-obj-$(CONFIG_TI_SOC_THERMAL)	+= ti-soc-thermal/
 obj-$(CONFIG_NET_VENDOR_SILICOM)	+= silicom/
 obj-$(CONFIG_CED1401)		+= ced1401/
 obj-$(CONFIG_DRM_IMX)		+= imx-drm/

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
@@ -169,4 +169,7 @@ config INTEL_POWERCLAMP
 	  enforce idle time which results in more package C-state residency. The
 	  user interface is exposed via generic thermal framework.
 
+menu "Texas Instruments thermal drivers"
+source "drivers/thermal/ti-soc-thermal/Kconfig"
+endmenu
 endif
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
@@ -23,4 +23,4 @@ obj-$(CONFIG_DB8500_THERMAL)	+= db8500_thermal.o
 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_TI_SOC_THERMAL)	+= ti-soc-thermal/
diff --git a/drivers/staging/ti-soc-thermal/Kconfig → drivers/thermal/ti-soc-thermal/Kconfig b/drivers/staging/ti-soc-thermal/Kconfig → drivers/thermal/ti-soc-thermal/Kconfig
diff --git a/drivers/staging/ti-soc-thermal/Makefile → drivers/thermal/ti-soc-thermal/Makefile b/drivers/staging/ti-soc-thermal/Makefile → drivers/thermal/ti-soc-thermal/Makefile
diff --git a/drivers/staging/ti-soc-thermal/TODO → drivers/thermal/ti-soc-thermal/TODO b/drivers/staging/ti-soc-thermal/TODO → drivers/thermal/ti-soc-thermal/TODO
diff --git a/...aging/ti-soc-thermal/omap4-thermal-data.c → ...ermal/ti-soc-thermal/omap4-thermal-data.c b/...aging/ti-soc-thermal/omap4-thermal-data.c → ...ermal/ti-soc-thermal/omap4-thermal-data.c
diff --git a/...staging/ti-soc-thermal/omap4xxx-bandgap.h → ...thermal/ti-soc-thermal/omap4xxx-bandgap.h b/...staging/ti-soc-thermal/omap4xxx-bandgap.h → ...thermal/ti-soc-thermal/omap4xxx-bandgap.h
diff --git a/...aging/ti-soc-thermal/omap5-thermal-data.c → ...ermal/ti-soc-thermal/omap5-thermal-data.c b/...aging/ti-soc-thermal/omap5-thermal-data.c → ...ermal/ti-soc-thermal/omap5-thermal-data.c
diff --git a/...staging/ti-soc-thermal/omap5xxx-bandgap.h → ...thermal/ti-soc-thermal/omap5xxx-bandgap.h b/...staging/ti-soc-thermal/omap5xxx-bandgap.h → ...thermal/ti-soc-thermal/omap5xxx-bandgap.h
diff --git a/drivers/staging/ti-soc-thermal/ti-bandgap.c → drivers/thermal/ti-soc-thermal/ti-bandgap.c b/drivers/staging/ti-soc-thermal/ti-bandgap.c → drivers/thermal/ti-soc-thermal/ti-bandgap.c
diff --git a/drivers/staging/ti-soc-thermal/ti-bandgap.h → drivers/thermal/ti-soc-thermal/ti-bandgap.h b/drivers/staging/ti-soc-thermal/ti-bandgap.h → drivers/thermal/ti-soc-thermal/ti-bandgap.h
diff --git a/...taging/ti-soc-thermal/ti-thermal-common.c → ...hermal/ti-soc-thermal/ti-thermal-common.c b/...taging/ti-soc-thermal/ti-thermal-common.c → ...hermal/ti-soc-thermal/ti-thermal-common.c
diff --git a/drivers/staging/ti-soc-thermal/ti-thermal.h → drivers/thermal/ti-soc-thermal/ti-thermal.h b/drivers/staging/ti-soc-thermal/ti-thermal.h → drivers/thermal/ti-soc-thermal/ti-thermal.h