diff options
author | Eduardo Valentin <eduardo.valentin@ti.com> | 2013-03-19 18:54:19 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 22:25:35 +0400 |
commit | 7372add4a154f993c3a03fc7fb99513b5faf597c (patch) | |
tree | 648dcfb6ff8e0694cf47864ad9e4afa3f9a5e43e /drivers | |
parent | d7f080e625af8a8586c716553fa28967c2c7b066 (diff) | |
download | linux-7372add4a154f993c3a03fc7fb99513b5faf597c.tar.xz |
staging: rename omap-thermal driver to ti-soc-thermal
Because this driver will support also OMAP derivatives,
this patch does a big rename inside this driver, so it
better fits its usage.
This patch only renames the directory, file names,
includes, Makefiles and Kconfig includes.
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Benoit <b-cousson@ti.com>
Cc: Nishanth Menon <nm@ti.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/Makefile | 2 | ||||
-rw-r--r-- | drivers/staging/omap-thermal/Makefile | 5 | ||||
-rw-r--r-- | drivers/staging/ti-soc-thermal/Kconfig (renamed from drivers/staging/omap-thermal/Kconfig) | 6 | ||||
-rw-r--r-- | drivers/staging/ti-soc-thermal/Makefile | 5 | ||||
-rw-r--r-- | drivers/staging/ti-soc-thermal/TODO (renamed from drivers/staging/omap-thermal/TODO) | 4 | ||||
-rw-r--r-- | drivers/staging/ti-soc-thermal/omap4-thermal-data.c (renamed from drivers/staging/omap-thermal/omap4-thermal-data.c) | 4 | ||||
-rw-r--r-- | drivers/staging/ti-soc-thermal/omap4xxx-bandgap.h (renamed from drivers/staging/omap-thermal/omap4xxx-bandgap.h) | 0 | ||||
-rw-r--r-- | drivers/staging/ti-soc-thermal/omap5-thermal-data.c (renamed from drivers/staging/omap-thermal/omap5-thermal-data.c) | 4 | ||||
-rw-r--r-- | drivers/staging/ti-soc-thermal/omap5xxx-bandgap.h (renamed from drivers/staging/omap-thermal/omap5xxx-bandgap.h) | 0 | ||||
-rw-r--r-- | drivers/staging/ti-soc-thermal/ti-bandgap.c (renamed from drivers/staging/omap-thermal/omap-bandgap.c) | 2 | ||||
-rw-r--r-- | drivers/staging/ti-soc-thermal/ti-bandgap.h (renamed from drivers/staging/omap-thermal/omap-bandgap.h) | 0 | ||||
-rw-r--r-- | drivers/staging/ti-soc-thermal/ti-thermal-common.c (renamed from drivers/staging/omap-thermal/omap-thermal-common.c) | 4 | ||||
-rw-r--r-- | drivers/staging/ti-soc-thermal/ti-thermal.h (renamed from drivers/staging/omap-thermal/omap-thermal.h) | 2 | ||||
-rw-r--r-- | drivers/staging/ti-soc-thermal/ti_soc_thermal.txt (renamed from drivers/staging/omap-thermal/omap_bandgap.txt) | 0 |
15 files changed, 21 insertions, 19 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index d4775a5de65c..5e62d00fb9e5 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -120,7 +120,7 @@ source "drivers/staging/gdm72xx/Kconfig" source "drivers/staging/csr/Kconfig" -source "drivers/staging/omap-thermal/Kconfig" +source "drivers/staging/ti-soc-thermal/Kconfig" source "drivers/staging/silicom/Kconfig" diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index e1ed6ad01c8e..284624c52adf 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -53,7 +53,7 @@ obj-$(CONFIG_ANDROID) += android/ obj-$(CONFIG_USB_WPAN_HCD) += ozwpan/ obj-$(CONFIG_WIMAX_GDM72XX) += gdm72xx/ obj-$(CONFIG_CSR_WIFI) += csr/ -obj-$(CONFIG_OMAP_BANDGAP) += omap-thermal/ +obj-$(CONFIG_OMAP_BANDGAP) += ti-soc-thermal/ obj-$(CONFIG_NET_VENDOR_SILICOM) += silicom/ obj-$(CONFIG_CED1401) += ced1401/ obj-$(CONFIG_DRM_IMX) += imx-drm/ diff --git a/drivers/staging/omap-thermal/Makefile b/drivers/staging/omap-thermal/Makefile deleted file mode 100644 index fbd14d1365db..000000000000 --- a/drivers/staging/omap-thermal/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -obj-$(CONFIG_OMAP_BANDGAP) += omap-thermal.o -omap-thermal-y := omap-bandgap.o -omap-thermal-$(CONFIG_OMAP_THERMAL) += omap-thermal-common.o -omap-thermal-$(CONFIG_OMAP4_THERMAL) += omap4-thermal-data.o -omap-thermal-$(CONFIG_OMAP5_THERMAL) += omap5-thermal-data.o diff --git a/drivers/staging/omap-thermal/Kconfig b/drivers/staging/ti-soc-thermal/Kconfig index 52170bfaf15d..6b3f3dbc57e5 100644 --- a/drivers/staging/omap-thermal/Kconfig +++ b/drivers/staging/ti-soc-thermal/Kconfig @@ -16,8 +16,10 @@ config OMAP_THERMAL depends on CPU_THERMAL help If you say yes here you want to get support for generic thermal - framework for the Texas Instruments OMAP4460+ on die bandgap - temperature sensor. + framework for the Texas Instruments on die bandgap temperature sensor. + + This includes trip points definitions, extrapolation rules and + CPU cooling device bindings. config OMAP4_THERMAL bool "Texas Instruments OMAP4 thermal support" diff --git a/drivers/staging/ti-soc-thermal/Makefile b/drivers/staging/ti-soc-thermal/Makefile new file mode 100644 index 000000000000..353947456632 --- /dev/null +++ b/drivers/staging/ti-soc-thermal/Makefile @@ -0,0 +1,5 @@ +obj-$(CONFIG_OMAP_BANDGAP) += ti-soc-thermal.o +ti-soc-thermal-y := ti-bandgap.o +ti-soc-thermal-$(CONFIG_OMAP_THERMAL) += ti-thermal-common.o +ti-soc-thermal-$(CONFIG_OMAP4_THERMAL) += omap4-thermal-data.o +ti-soc-thermal-$(CONFIG_OMAP5_THERMAL) += omap5-thermal-data.o diff --git a/drivers/staging/omap-thermal/TODO b/drivers/staging/ti-soc-thermal/TODO index d45f556a7fb3..9b4c84170a7c 100644 --- a/drivers/staging/omap-thermal/TODO +++ b/drivers/staging/ti-soc-thermal/TODO @@ -1,13 +1,13 @@ List of TODOs (by Eduardo Valentin) -on omap-bandgap.c: +on ti-bandgap.c: - Test every exposed API to userland - Add support to hwmon - Revisit PM support - Revisit data structures and simplify them - Once SCM-core api settles, update this driver accordingly -on omap-thermal-common.c/omap-thermal.h: +on ti-thermal-common.c/ti-thermal.h: - Revisit extrapolation constants for O4/O5 - Revisit need for locking - Revisit trips and its definitions diff --git a/drivers/staging/omap-thermal/omap4-thermal-data.c b/drivers/staging/ti-soc-thermal/omap4-thermal-data.c index 88ed01446d7c..97544f79f493 100644 --- a/drivers/staging/omap-thermal/omap4-thermal-data.c +++ b/drivers/staging/ti-soc-thermal/omap4-thermal-data.c @@ -16,8 +16,8 @@ * */ -#include "omap-thermal.h" -#include "omap-bandgap.h" +#include "ti-thermal.h" +#include "ti-bandgap.h" #include "omap4xxx-bandgap.h" /* diff --git a/drivers/staging/omap-thermal/omap4xxx-bandgap.h b/drivers/staging/ti-soc-thermal/omap4xxx-bandgap.h index 6f2de3a3356d..6f2de3a3356d 100644 --- a/drivers/staging/omap-thermal/omap4xxx-bandgap.h +++ b/drivers/staging/ti-soc-thermal/omap4xxx-bandgap.h diff --git a/drivers/staging/omap-thermal/omap5-thermal-data.c b/drivers/staging/ti-soc-thermal/omap5-thermal-data.c index a48c286dde01..172b4ada0119 100644 --- a/drivers/staging/omap-thermal/omap5-thermal-data.c +++ b/drivers/staging/ti-soc-thermal/omap5-thermal-data.c @@ -16,9 +16,9 @@ * */ -#include "omap-bandgap.h" +#include "ti-thermal.h" +#include "ti-bandgap.h" #include "omap5xxx-bandgap.h" -#include "omap-thermal.h" /* * OMAP5430 has three instances of thermal sensor for MPU, GPU & CORE, diff --git a/drivers/staging/omap-thermal/omap5xxx-bandgap.h b/drivers/staging/ti-soc-thermal/omap5xxx-bandgap.h index 8824db4391c4..8824db4391c4 100644 --- a/drivers/staging/omap-thermal/omap5xxx-bandgap.h +++ b/drivers/staging/ti-soc-thermal/omap5xxx-bandgap.h diff --git a/drivers/staging/omap-thermal/omap-bandgap.c b/drivers/staging/ti-soc-thermal/ti-bandgap.c index 1189ca731a54..5a8ae9c115ea 100644 --- a/drivers/staging/omap-thermal/omap-bandgap.c +++ b/drivers/staging/ti-soc-thermal/ti-bandgap.c @@ -40,7 +40,7 @@ #include <linux/of_irq.h> #include <linux/io.h> -#include "omap-bandgap.h" +#include "ti-bandgap.h" /*** Helper functions to access registers and their bitfields ***/ diff --git a/drivers/staging/omap-thermal/omap-bandgap.h b/drivers/staging/ti-soc-thermal/ti-bandgap.h index ad83be8ce7e6..ad83be8ce7e6 100644 --- a/drivers/staging/omap-thermal/omap-bandgap.h +++ b/drivers/staging/ti-soc-thermal/ti-bandgap.h diff --git a/drivers/staging/omap-thermal/omap-thermal-common.c b/drivers/staging/ti-soc-thermal/ti-thermal-common.c index 9f7a77b6078d..feab2f4d6d5d 100644 --- a/drivers/staging/omap-thermal/omap-thermal-common.c +++ b/drivers/staging/ti-soc-thermal/ti-thermal-common.c @@ -32,8 +32,8 @@ #include <linux/cpumask.h> #include <linux/cpu_cooling.h> -#include "omap-thermal.h" -#include "omap-bandgap.h" +#include "ti-thermal.h" +#include "ti-bandgap.h" /* common data structures */ struct omap_thermal_data { diff --git a/drivers/staging/omap-thermal/omap-thermal.h b/drivers/staging/ti-soc-thermal/ti-thermal.h index 26cfc8d3495f..6fed8ac8032b 100644 --- a/drivers/staging/omap-thermal/omap-thermal.h +++ b/drivers/staging/ti-soc-thermal/ti-thermal.h @@ -23,7 +23,7 @@ #ifndef __OMAP_THERMAL_H #define __OMAP_THERMAL_H -#include "omap-bandgap.h" +#include "ti-bandgap.h" /* sensors gradient and offsets */ #define OMAP_GRADIENT_SLOPE_4460 348 diff --git a/drivers/staging/omap-thermal/omap_bandgap.txt b/drivers/staging/ti-soc-thermal/ti_soc_thermal.txt index a4a33d1a0746..a4a33d1a0746 100644 --- a/drivers/staging/omap-thermal/omap_bandgap.txt +++ b/drivers/staging/ti-soc-thermal/ti_soc_thermal.txt |