From patchwork Fri May 20 14:08:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manjunath Hadli X-Patchwork-Id: 803702 Received: from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4KE9KOV016746 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 20 May 2011 14:09:42 GMT Received: from dlep34.itg.ti.com ([157.170.170.115]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id p4KE8MUP016517 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 20 May 2011 09:08:22 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep34.itg.ti.com (8.13.7/8.13.7) with ESMTP id p4KE8MO9002999; Fri, 20 May 2011 09:08:22 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 191D580627; Fri, 20 May 2011 09:08:22 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dbdp20.itg.ti.com (dbdp20.itg.ti.com [172.24.170.38]) by linux.omap.com (Postfix) with ESMTP id 3314E80626 for ; Fri, 20 May 2011 09:08:20 -0500 (CDT) Received: from dbde70.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id p4KE8Iqf019516; Fri, 20 May 2011 19:38:18 +0530 (IST) Received: from dbdp31.itg.ti.com (172.24.170.98) by DBDE70.ent.ti.com (172.24.170.148) with Microsoft SMTP Server id 8.3.106.1; Fri, 20 May 2011 19:38:18 +0530 Received: from psplinux051.india.ti.com (psplinux051.india.ti.com [172.24.162.244]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id p4KE8HnT009955; Fri, 20 May 2011 19:38:18 +0530 (IST) Received: from psplinux051.india.ti.com (localhost [127.0.0.1]) by psplinux051.india.ti.com (8.13.1/8.13.1) with ESMTP id p4KE8HJ7003705; Fri, 20 May 2011 19:38:17 +0530 Received: (from x0144960@localhost) by psplinux051.india.ti.com (8.13.1/8.13.1/Submit) id p4KE8Hgk003702; Fri, 20 May 2011 19:38:17 +0530 From: Manjunath Hadli To: dlos Subject: [PATCH 1/4] davinci: dm644x: move EMAC definitions from dm644x.h to dm644x.c Date: Fri, 20 May 2011 19:38:17 +0530 Message-ID: <1305900497-3668-1-git-send-email-manjunath.hadli@ti.com> X-Mailer: git-send-email 1.6.2.4 MIME-Version: 1.0 Cc: LAK X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: davinci-linux-open-source-bounces@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com X-Greylist: Sender succeeded STARTTLS authentication, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 20 May 2011 14:09:42 +0000 (UTC) move the register base addresses and offsets used only by dm644x platform file from platform header dm644x.h to dm644x.c as they are used only in the c file. Signed-off-by: Manjunath Hadli --- arch/arm/mach-davinci/dm644x.c | 16 +++++++++++----- arch/arm/mach-davinci/include/mach/dm644x.h | 7 ------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index 9a2376b..4fbb250 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -30,11 +30,6 @@ #include "clock.h" #include "mux.h" -/* - * Device specific clocks - */ -#define DM644X_REF_FREQ 27000000 - static struct pll_data pll1_data = { .num = 1, .phys_base = DAVINCI_PLL1_BASE, @@ -45,6 +40,8 @@ static struct pll_data pll2_data = { .phys_base = DAVINCI_PLL2_BASE, }; +#define DM644X_REF_FREQ 27000000 + static struct clk ref_clk = { .name = "ref_clk", .rate = DM644X_REF_FREQ, @@ -318,6 +315,11 @@ static struct clk_lookup dm644x_clks[] = { CLK(NULL, NULL, NULL), }; +#define DM644X_EMAC_CNTRL_OFFSET 0x0000 +#define DM644X_EMAC_CNTRL_MOD_OFFSET 0x1000 +#define DM644X_EMAC_CNTRL_RAM_OFFSET 0x2000 +#define DM644X_EMAC_CNTRL_RAM_SIZE 0x2000 + static struct emac_platform_data dm644x_emac_pdata = { .ctrl_reg_offset = DM644X_EMAC_CNTRL_OFFSET, .ctrl_mod_reg_offset = DM644X_EMAC_CNTRL_MOD_OFFSET, @@ -326,6 +328,8 @@ static struct emac_platform_data dm644x_emac_pdata = { .version = EMAC_VERSION_1, }; +#define DM644X_EMAC_BASE 0x01C80000 + static struct resource dm644x_emac_resources[] = { { .start = DM644X_EMAC_BASE, @@ -349,6 +353,8 @@ static struct platform_device dm644x_emac_device = { .resource = dm644x_emac_resources, }; +#define DM644X_EMAC_MDIO_BASE (DM644X_EMAC_BASE + 0x4000) + static struct resource dm644x_mdio_resources[] = { { .start = DM644X_EMAC_MDIO_BASE, diff --git a/arch/arm/mach-davinci/include/mach/dm644x.h b/arch/arm/mach-davinci/include/mach/dm644x.h index 5a1b26d..724377f 100644 --- a/arch/arm/mach-davinci/include/mach/dm644x.h +++ b/arch/arm/mach-davinci/include/mach/dm644x.h @@ -27,13 +27,6 @@ #include #include -#define DM644X_EMAC_BASE (0x01C80000) -#define DM644X_EMAC_MDIO_BASE (DM644X_EMAC_BASE + 0x4000) -#define DM644X_EMAC_CNTRL_OFFSET (0x0000) -#define DM644X_EMAC_CNTRL_MOD_OFFSET (0x1000) -#define DM644X_EMAC_CNTRL_RAM_OFFSET (0x2000) -#define DM644X_EMAC_CNTRL_RAM_SIZE (0x2000) - #define DM644X_ASYNC_EMIF_CONTROL_BASE 0x01E00000 #define DM644X_ASYNC_EMIF_DATA_CE0_BASE 0x02000000 #define DM644X_ASYNC_EMIF_DATA_CE1_BASE 0x04000000