aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/ti-soc-thermal
diff options
context:
space:
mode:
authorEduardo Valentin <eduardo.valentin@ti.com>2013-03-19 10:54:20 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-25 11:27:49 -0700
commit097ca6a347fbef554e9453180f1269147f68144f (patch)
treeba381b2e2e770fd9b5e284f2926b170425ae501a /drivers/staging/ti-soc-thermal
parent7372add4a154f993c3a03fc7fb99513b5faf597c (diff)
downloadlinux-097ca6a347fbef554e9453180f1269147f68144f.tar.gz
staging: ti-soc-thermal: rename Kconfig options
This patch renames the Kconfig options to cope with the new naming convention. 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/staging/ti-soc-thermal')
-rw-r--r--drivers/staging/ti-soc-thermal/Kconfig14
-rw-r--r--drivers/staging/ti-soc-thermal/Makefile4
-rw-r--r--drivers/staging/ti-soc-thermal/ti-thermal.h6
3 files changed, 12 insertions, 12 deletions
diff --git a/drivers/staging/ti-soc-thermal/Kconfig b/drivers/staging/ti-soc-thermal/Kconfig
index 6b3f3dbc57e..e81375fb215 100644
--- a/drivers/staging/ti-soc-thermal/Kconfig
+++ b/drivers/staging/ti-soc-thermal/Kconfig
@@ -1,5 +1,5 @@
-config OMAP_BANDGAP
- tristate "Texas Instruments OMAP4+ temperature sensor driver"
+config TI_SOC_THERMAL
+ tristate "Texas Instruments SoCs temperature sensor driver"
depends on THERMAL
depends on ARCH_HAS_BANDGAP
help
@@ -10,9 +10,9 @@ config OMAP_BANDGAP
This includes alert interrupts generation and also the TSHUT
support.
-config OMAP_THERMAL
- bool "Texas Instruments OMAP4+ thermal framework support"
- depends on OMAP_BANDGAP
+config TI_THERMAL
+ bool "Texas Instruments SoCs thermal framework support"
+ depends on TI_SOC_THERMAL
depends on CPU_THERMAL
help
If you say yes here you want to get support for generic thermal
@@ -23,7 +23,7 @@ config OMAP_THERMAL
config OMAP4_THERMAL
bool "Texas Instruments OMAP4 thermal support"
- depends on OMAP_BANDGAP
+ depends on TI_SOC_THERMAL
depends on ARCH_OMAP4
help
If you say yes here you get thermal support for the Texas Instruments
@@ -37,7 +37,7 @@ config OMAP4_THERMAL
config OMAP5_THERMAL
bool "Texas Instruments OMAP5 thermal support"
- depends on OMAP_BANDGAP
+ depends on TI_SOC_THERMAL
depends on SOC_OMAP5
help
If you say yes here you get thermal support for the Texas Instruments
diff --git a/drivers/staging/ti-soc-thermal/Makefile b/drivers/staging/ti-soc-thermal/Makefile
index 35394745663..0ca034fb419 100644
--- a/drivers/staging/ti-soc-thermal/Makefile
+++ b/drivers/staging/ti-soc-thermal/Makefile
@@ -1,5 +1,5 @@
-obj-$(CONFIG_OMAP_BANDGAP) += ti-soc-thermal.o
+obj-$(CONFIG_TI_SOC_THERMAL) += 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_TI_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/ti-soc-thermal/ti-thermal.h b/drivers/staging/ti-soc-thermal/ti-thermal.h
index 6fed8ac8032..3ed4adb765e 100644
--- a/drivers/staging/ti-soc-thermal/ti-thermal.h
+++ b/drivers/staging/ti-soc-thermal/ti-thermal.h
@@ -20,8 +20,8 @@
* 02110-1301 USA
*
*/
-#ifndef __OMAP_THERMAL_H
-#define __OMAP_THERMAL_H
+#ifndef __TI_THERMAL_H
+#define __TI_THERMAL_H
#include "ti-bandgap.h"
@@ -73,7 +73,7 @@
#define omap_thermal_is_valid_trip(trip) \
((trip) >= 0 && (trip) < OMAP_TRIP_NUMBER)
-#ifdef CONFIG_OMAP_THERMAL
+#ifdef CONFIG_TI_THERMAL
int omap_thermal_expose_sensor(struct omap_bandgap *bgp, int id,
char *domain);
int omap_thermal_remove_sensor(struct omap_bandgap *bgp, int id);