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>

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 284624c52adf9c6cf26f9a8daea0f5bd09a65c72..b6d15ec95dd0f93d3cc454d6bda9a3c27ea7533a 100644 (file)
--- 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)     += ti-soc-thermal/
+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/staging/ti-soc-thermal/Kconfig b/drivers/staging/ti-soc-thermal/Kconfig
index 6b3f3dbc57e5cbd8f4f4a74c1c6d38b284a58514..e81375fb21552413f3df4689e4c950aab820eb8e 100644 (file)
--- 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 353947456632ba46a84c24fd79b06e8216b1c1ae..0ca034fb419de8dbfa05d5894195f9a4065d5f85 100644 (file)
--- 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 6fed8ac8032bb35c061acbbaca752e75aef833b6..3ed4adb765e242750e6c137893c3fca296a94c5a 100644 (file)
--- 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);