ARM: davinci: dm644x: move private definitions to C file

Move register base addresses and offsets used only by dm644x.c
from arch/arm/mach-davinci/include/mach/dm644x.h to the C file
as these definitions are used only there.

This helps reduce code in arch/arm/mach-davinci/include/mach
which is not really needed by rest of the kernel.

Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 43a48ee1917bcf0ca1cabd5f15b2e231664ccd4d..7da3d77e398cc4d2f2263a70b45aa2d01a27d1a9 100644 (file)
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -35,6 +35,13 @@
  */
 #define DM644X_REF_FREQ                27000000
 
+#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
+
 static struct pll_data pll1_data = {
        .num       = 1,
        .phys_base = DAVINCI_PLL1_BASE,

diff --git a/arch/arm/mach-davinci/include/mach/dm644x.h b/arch/arm/mach-davinci/include/mach/dm644x.h
index 5a1b26d4e68b41936ac16ee574d34d7be8342e6c..724377f20a051f4a4a0b691601589549841c2d29 100644 (file)
--- a/arch/arm/mach-davinci/include/mach/dm644x.h
+++ b/arch/arm/mach-davinci/include/mach/dm644x.h
@@ -27,13 +27,6 @@
 #include <mach/asp.h>
 #include <media/davinci/vpfe_capture.h>
 
-#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