From patchwork Tue Mar 19 14:54:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Valentin X-Patchwork-Id: 2301251 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 48AC4E00E5 for ; Tue, 19 Mar 2013 14:57:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932137Ab3CSO44 (ORCPT ); Tue, 19 Mar 2013 10:56:56 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:56757 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932121Ab3CSO4z (ORCPT ); Tue, 19 Mar 2013 10:56:55 -0400 Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id r2JEuM3O018159; Tue, 19 Mar 2013 09:56:22 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r2JEuMVF009394; Tue, 19 Mar 2013 09:56:22 -0500 Received: from dlelxv24.itg.ti.com (172.17.1.199) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.2.342.3; Tue, 19 Mar 2013 09:56:21 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlelxv24.itg.ti.com (8.13.8/8.13.8) with ESMTP id r2JEuL9G002155; Tue, 19 Mar 2013 09:56:21 -0500 Received: from localhost (h64-11.vpn.ti.com [172.24.64.11]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id r2JEuGV13274; Tue, 19 Mar 2013 09:56:17 -0500 (CDT) From: Eduardo Valentin To: CC: , , , , Eduardo Valentin , Santosh Shilimkar , Benoit , Nishanth Menon , Dan Carpenter Subject: [PATCHv2 04/12] staging: ti-soc-thermal: rename Kconfig options Date: Tue, 19 Mar 2013 10:54:20 -0400 Message-ID: <1363704868-11843-5-git-send-email-eduardo.valentin@ti.com> X-Mailer: git-send-email 1.7.7.1.488.ge8e1c In-Reply-To: <1363704868-11843-1-git-send-email-eduardo.valentin@ti.com> References: <1363704868-11843-1-git-send-email-eduardo.valentin@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org This patch renames the Kconfig options to cope with the new naming convention. Cc: Santosh Shilimkar Cc: Benoit Cc: Nishanth Menon Cc: Dan Carpenter Signed-off-by: Eduardo Valentin --- drivers/staging/Makefile | 2 +- drivers/staging/ti-soc-thermal/Kconfig | 14 +++++++------- drivers/staging/ti-soc-thermal/Makefile | 4 ++-- drivers/staging/ti-soc-thermal/ti-thermal.h | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 284624c..b6d15ec 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) += 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 6b3f3db..e81375f 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 3539474..0ca034f 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 6fed8ac..3ed4adb 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);