Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 097ca6a3 authored by Eduardo Valentin's avatar Eduardo Valentin Committed by Greg Kroah-Hartman
Browse files

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: default avatarEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7372add4

drivers/staging/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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/

drivers/staging/ti-soc-thermal/Kconfig

+7 −7
Original line number Diff line number Diff line 
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

drivers/staging/ti-soc-thermal/Makefile

+2 −2
Original line number Diff line number Diff line 
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

drivers/staging/ti-soc-thermal/ti-thermal.h

+3 −3
Original line number Diff line number Diff line
@@ -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);