From: manjunath.hadli@ti.com (Manjunath Hadli)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 04/11] ARM: davinci: dm646x: remove the macros from the header to move to c file
Date: Tue, 13 Dec 2011 16:53:28 +0530 [thread overview]
Message-ID: <1323775415-24504-5-git-send-email-manjunath.hadli@ti.com> (raw)
In-Reply-To: <1323775415-24504-1-git-send-email-manjunath.hadli@ti.com>
move the register base addresses and offsets used only by dm646x
platform file from platform header dm646x.h to dm646x.c as they
are used only in the c file.
Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
---
arch/arm/mach-davinci/dm646x.c | 7 +++++++
arch/arm/mach-davinci/include/mach/dm646x.h | 7 -------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index 0b68ed5..0560e82 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -46,6 +46,13 @@
#define DM646X_REF_FREQ 27000000
#define DM646X_AUX_FREQ 24000000
+#define DM646X_EMAC_BASE 0x01c80000
+#define DM646X_EMAC_MDIO_BASE (DM646X_EMAC_BASE + 0x4000)
+#define DM646X_EMAC_CNTRL_OFFSET 0x0000
+#define DM646X_EMAC_CNTRL_MOD_OFFSET 0x1000
+#define DM646X_EMAC_CNTRL_RAM_OFFSET 0x2000
+#define DM646X_EMAC_CNTRL_RAM_SIZE 0x2000
+
static struct pll_data pll1_data = {
.num = 1,
.phys_base = DAVINCI_PLL1_BASE,
diff --git a/arch/arm/mach-davinci/include/mach/dm646x.h b/arch/arm/mach-davinci/include/mach/dm646x.h
index a8ee6c9..eb95864 100644
--- a/arch/arm/mach-davinci/include/mach/dm646x.h
+++ b/arch/arm/mach-davinci/include/mach/dm646x.h
@@ -18,13 +18,6 @@
#include <linux/davinci_emac.h>
#include <media/davinci/vpif_types.h>
-#define DM646X_EMAC_BASE (0x01C80000)
-#define DM646X_EMAC_MDIO_BASE (DM646X_EMAC_BASE + 0x4000)
-#define DM646X_EMAC_CNTRL_OFFSET (0x0000)
-#define DM646X_EMAC_CNTRL_MOD_OFFSET (0x1000)
-#define DM646X_EMAC_CNTRL_RAM_OFFSET (0x2000)
-#define DM646X_EMAC_CNTRL_RAM_SIZE (0x2000)
-
#define DM646X_ASYNC_EMIF_CONTROL_BASE 0x20008000
#define DM646X_ASYNC_EMIF_CS2_SPACE_BASE 0x42000000
--
1.6.2.4
next prev parent reply other threads:[~2011-12-13 11:23 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-13 11:23 [PATCH v5 00/11]ARM: davinci:add support for dm644x vpbe display driver Manjunath Hadli
2011-12-13 11:23 ` [PATCH v5 01/11] davinci: vpif: remove obsolete header file inclusion Manjunath Hadli
2011-12-13 11:23 ` [PATCH v5 02/11] ARM: davinci: dm644x: remove the macros from the header to move to c file Manjunath Hadli
2011-12-13 11:23 ` [PATCH v5 03/11] ARM: davinci: dm365: " Manjunath Hadli
2011-12-13 11:23 ` Manjunath Hadli [this message]
2011-12-13 11:23 ` [PATCH v5 05/11] ARM: davinci: create new common platform header for davinci Manjunath Hadli
2011-12-13 11:23 ` [PATCH v5 06/11] davinci: eliminate use of IO_ADDRESS() on sysmod Manjunath Hadli
2011-12-13 11:23 ` [PATCH v5 07/11] davinci: dm644x: Replace register base value with a defined macro Manjunath Hadli
2011-12-14 10:36 ` Sergei Shtylyov
2011-12-15 11:11 ` Hadli, Manjunath
2011-12-13 11:23 ` [PATCH v5 08/11] davinci: dm644x: change vpfe capture structure variables for consistency Manjunath Hadli
2011-12-13 11:23 ` [PATCH v5 09/11] davinci: dm644x: move vpfe init from soc to board specific files Manjunath Hadli
2011-12-13 11:23 ` [PATCH v5 10/11] davinci: dm644x: add support for v4l2 video display Manjunath Hadli
2011-12-14 10:48 ` Sergei Shtylyov
2011-12-15 11:13 ` Hadli, Manjunath
2011-12-13 11:23 ` [PATCH v5 11/11] davinci: dm644x EVM: add support for VPBE display Manjunath Hadli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1323775415-24504-5-git-send-email-manjunath.hadli@ti.com \
--to=manjunath.hadli@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).