commit | eb982001dbd8546f273f444868a1031cc78b4250 | [log] [tgz] |
---|---|---|
author | Eduardo Valentin <eduardo.valentin@ti.com> | Wed May 15 15:46:00 2013 +0000 |
committer | Zhang Rui <rui.zhang@intel.com> | Tue May 28 10:40:37 2013 +0800 |
tree | 08547bb02ed69dec61a69511b66e1ee6ac8e49d1 | |
parent | c240a539df4e2d50f86e2f31813ff6b7334cd493 [diff] |
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>
diff --git a/drivers/staging/ti-soc-thermal/ti_soc_thermal.txt b/Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt similarity index 100% rename from drivers/staging/ti-soc-thermal/ti_soc_thermal.txt rename to Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 4e8a179..79701de 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig
@@ -118,8 +118,6 @@ 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 index 415772e..f8b740c 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile
@@ -52,7 +52,6 @@ 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 index 5e3c025..7205c70 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig
@@ -169,4 +169,7 @@ 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 index c054d41..8569394 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile
@@ -23,4 +23,4 @@ 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 b/drivers/thermal/ti-soc-thermal/Kconfig similarity index 100% rename from drivers/staging/ti-soc-thermal/Kconfig rename to drivers/thermal/ti-soc-thermal/Kconfig
diff --git a/drivers/staging/ti-soc-thermal/Makefile b/drivers/thermal/ti-soc-thermal/Makefile similarity index 100% rename from drivers/staging/ti-soc-thermal/Makefile rename to drivers/thermal/ti-soc-thermal/Makefile
diff --git a/drivers/staging/ti-soc-thermal/TODO b/drivers/thermal/ti-soc-thermal/TODO similarity index 100% rename from drivers/staging/ti-soc-thermal/TODO rename to drivers/thermal/ti-soc-thermal/TODO
diff --git a/drivers/staging/ti-soc-thermal/omap4-thermal-data.c b/drivers/thermal/ti-soc-thermal/omap4-thermal-data.c similarity index 100% rename from drivers/staging/ti-soc-thermal/omap4-thermal-data.c rename to drivers/thermal/ti-soc-thermal/omap4-thermal-data.c
diff --git a/drivers/staging/ti-soc-thermal/omap4xxx-bandgap.h b/drivers/thermal/ti-soc-thermal/omap4xxx-bandgap.h similarity index 100% rename from drivers/staging/ti-soc-thermal/omap4xxx-bandgap.h rename to drivers/thermal/ti-soc-thermal/omap4xxx-bandgap.h
diff --git a/drivers/staging/ti-soc-thermal/omap5-thermal-data.c b/drivers/thermal/ti-soc-thermal/omap5-thermal-data.c similarity index 100% rename from drivers/staging/ti-soc-thermal/omap5-thermal-data.c rename to drivers/thermal/ti-soc-thermal/omap5-thermal-data.c
diff --git a/drivers/staging/ti-soc-thermal/omap5xxx-bandgap.h b/drivers/thermal/ti-soc-thermal/omap5xxx-bandgap.h similarity index 100% rename from drivers/staging/ti-soc-thermal/omap5xxx-bandgap.h rename to drivers/thermal/ti-soc-thermal/omap5xxx-bandgap.h
diff --git a/drivers/staging/ti-soc-thermal/ti-bandgap.c b/drivers/thermal/ti-soc-thermal/ti-bandgap.c similarity index 100% rename from drivers/staging/ti-soc-thermal/ti-bandgap.c rename to drivers/thermal/ti-soc-thermal/ti-bandgap.c
diff --git a/drivers/staging/ti-soc-thermal/ti-bandgap.h b/drivers/thermal/ti-soc-thermal/ti-bandgap.h similarity index 100% rename from drivers/staging/ti-soc-thermal/ti-bandgap.h rename to drivers/thermal/ti-soc-thermal/ti-bandgap.h
diff --git a/drivers/staging/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c similarity index 100% rename from drivers/staging/ti-soc-thermal/ti-thermal-common.c rename to drivers/thermal/ti-soc-thermal/ti-thermal-common.c
diff --git a/drivers/staging/ti-soc-thermal/ti-thermal.h b/drivers/thermal/ti-soc-thermal/ti-thermal.h similarity index 100% rename from drivers/staging/ti-soc-thermal/ti-thermal.h rename to drivers/thermal/ti-soc-thermal/ti-thermal.h