From patchwork Tue Mar 26 15:20:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 231304 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id F0B102C009F for ; Wed, 27 Mar 2013 02:22:46 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BC2824A13D; Tue, 26 Mar 2013 16:22:10 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YaDjnR5ofKyx; Tue, 26 Mar 2013 16:22:10 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2C4C44A143; Tue, 26 Mar 2013 16:21:22 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D36124A122 for ; Tue, 26 Mar 2013 16:21:13 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Av4KzM9eonQb for ; Tue, 26 Mar 2013 16:21:12 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by theia.denx.de (Postfix) with ESMTPS id 32EF74A10B for ; Tue, 26 Mar 2013 16:21:06 +0100 (CET) Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id r2QFL5nW008454 for ; Tue, 26 Mar 2013 10:21:05 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r2QFL4sj017249 for ; Tue, 26 Mar 2013 10:21:04 -0500 Received: from dlelxv22.itg.ti.com (172.17.1.197) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.2.342.3; Tue, 26 Mar 2013 10:21:04 -0500 Received: from localhost (kahuna.am.dhcp.ti.com [128.247.75.12]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id r2QFL4nI005442; Tue, 26 Mar 2013 10:21:04 -0500 From: Nishanth Menon To: tom , Sricharan R Date: Tue, 26 Mar 2013 10:20:54 -0500 Message-ID: <1364311258-21754-7-git-send-email-nm@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1364311258-21754-1-git-send-email-nm@ti.com> References: <1364311258-21754-1-git-send-email-nm@ti.com> MIME-Version: 1.0 Cc: Ruchika@theia.denx.de, u-boot , Balaji T K , Kharwar Subject: [U-Boot] [PATCH V3 06/10] twl6035: rename to palmas X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de TPS659038/TWL6035/TWL6037 all belong to palmas family of TI PMICs Rename twl6035 to palmas to allow reuse across multiple current and future platforms As part of this change, change the CONFIG_TWL6035_POWER to CONFIG_PALMAS_POWER and update usage of header file accordingly. Signed-off-by: Nishanth Menon --- V3: new patch board/ti/dra7xx/evm.c | 2 +- board/ti/omap5_evm/evm.c | 4 ++-- drivers/mmc/omap_hsmmc.c | 6 +++--- drivers/power/Makefile | 2 +- drivers/power/{twl6035.c => palmas.c} | 4 ++-- include/configs/omap5_evm.h | 2 +- include/{twl6035.h => palmas.h} | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) rename drivers/power/{twl6035.c => palmas.c} (97%) rename include/{twl6035.h => palmas.h} (95%) diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index 7bbb549..bf7e091 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -27,7 +27,7 @@ * MA 02111-1307 USA */ #include -#include +#include #include #include diff --git a/board/ti/omap5_evm/evm.c b/board/ti/omap5_evm/evm.c index 55337c0..701842b 100644 --- a/board/ti/omap5_evm/evm.c +++ b/board/ti/omap5_evm/evm.c @@ -23,7 +23,7 @@ * MA 02111-1307 USA */ #include -#include +#include #include #include @@ -63,7 +63,7 @@ int board_eth_init(bd_t *bis) */ int misc_init_r(void) { -#ifdef CONFIG_TWL6035_POWER +#ifdef CONFIG_PALMAS_POWER twl6035_init_settings(); #endif return 0; diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c index 67cfcc2..b7a9eb0 100644 --- a/drivers/mmc/omap_hsmmc.c +++ b/drivers/mmc/omap_hsmmc.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -107,7 +107,7 @@ static void omap4_vmmc_pbias_config(struct mmc *mmc) } #endif -#if defined(CONFIG_OMAP54XX) && defined(CONFIG_TWL6035_POWER) +#if defined(CONFIG_OMAP54XX) && defined(CONFIG_PALMAS_POWER) static void omap5_pbias_config(struct mmc *mmc) { u32 value = 0; @@ -178,7 +178,7 @@ unsigned char mmc_board_init(struct mmc *mmc) if (mmc->block_dev.dev == 0) omap4_vmmc_pbias_config(mmc); #endif -#if defined(CONFIG_OMAP54XX) && defined(CONFIG_TWL6035_POWER) +#if defined(CONFIG_OMAP54XX) && defined(CONFIG_PALMAS_POWER) if (mmc->block_dev.dev == 0) omap5_pbias_config(mmc); #endif diff --git a/drivers/power/Makefile b/drivers/power/Makefile index 8c71901..a2a5bd2 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -29,7 +29,7 @@ COBJS-$(CONFIG_FTPMU010_POWER) += ftpmu010.o COBJS-$(CONFIG_TPS6586X_POWER) += tps6586x.o COBJS-$(CONFIG_TWL4030_POWER) += twl4030.o COBJS-$(CONFIG_TWL6030_POWER) += twl6030.o -COBJS-$(CONFIG_TWL6035_POWER) += twl6035.o +COBJS-$(CONFIG_PALMAS_POWER) += palmas.o COBJS-$(CONFIG_POWER) += power_core.o COBJS-$(CONFIG_DIALOG_POWER) += power_dialog.o diff --git a/drivers/power/twl6035.c b/drivers/power/palmas.c similarity index 97% rename from drivers/power/twl6035.c rename to drivers/power/palmas.c index d3de698..8ed7742 100644 --- a/drivers/power/twl6035.c +++ b/drivers/power/palmas.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2012 + * (C) Copyright 2012-2013 * Texas Instruments, * * See file CREDITS for list of people who contributed to this @@ -21,7 +21,7 @@ * MA 02111-1307 USA */ #include -#include +#include /* Functions to read and write from TWL6030 */ int twl6035_i2c_write_u8(u8 chip_no, u8 val, u8 reg) diff --git a/include/configs/omap5_evm.h b/include/configs/omap5_evm.h index 22a8e13..4ad943a 100644 --- a/include/configs/omap5_evm.h +++ b/include/configs/omap5_evm.h @@ -32,7 +32,7 @@ /* TWL6035 */ #ifndef CONFIG_SPL_BUILD -#define CONFIG_TWL6035_POWER +#define CONFIG_PALMAS_POWER #endif #define CONFIG_SYS_PROMPT "OMAP5430 EVM # " diff --git a/include/twl6035.h b/include/palmas.h similarity index 95% rename from include/twl6035.h rename to include/palmas.h index ce74348..cf836d7 100644 --- a/include/twl6035.h +++ b/include/palmas.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2012 + * (C) Copyright 2012-2013 * Texas Instruments, * * See file CREDITS for list of people who contributed to this @@ -25,7 +25,7 @@ #include /* I2C chip addresses */ -#define TWL6035_CHIP_ADDR 0x48 +#define PALMAS_CHIP_ADDR 0x48 /* 0x1XY translates to page 1, register address 0xXY */ #define LDO9_CTRL 0x60