diff options
Diffstat (limited to 'arch/arm/mach-davinci')
-rw-r--r-- | arch/arm/mach-davinci/dm646x.c | 7 | ||||
-rw-r--r-- | 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 00f774394b16..7c9a62d6f577 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c | |||
@@ -46,6 +46,13 @@ | |||
46 | #define DM646X_REF_FREQ 27000000 | 46 | #define DM646X_REF_FREQ 27000000 |
47 | #define DM646X_AUX_FREQ 24000000 | 47 | #define DM646X_AUX_FREQ 24000000 |
48 | 48 | ||
49 | #define DM646X_EMAC_BASE 0x01c80000 | ||
50 | #define DM646X_EMAC_MDIO_BASE (DM646X_EMAC_BASE + 0x4000) | ||
51 | #define DM646X_EMAC_CNTRL_OFFSET 0x0000 | ||
52 | #define DM646X_EMAC_CNTRL_MOD_OFFSET 0x1000 | ||
53 | #define DM646X_EMAC_CNTRL_RAM_OFFSET 0x2000 | ||
54 | #define DM646X_EMAC_CNTRL_RAM_SIZE 0x2000 | ||
55 | |||
49 | static struct pll_data pll1_data = { | 56 | static struct pll_data pll1_data = { |
50 | .num = 1, | 57 | .num = 1, |
51 | .phys_base = DAVINCI_PLL1_BASE, | 58 | .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 a8ee6c9f0bb0..eb958648d432 100644 --- a/arch/arm/mach-davinci/include/mach/dm646x.h +++ b/arch/arm/mach-davinci/include/mach/dm646x.h | |||
@@ -18,13 +18,6 @@ | |||
18 | #include <linux/davinci_emac.h> | 18 | #include <linux/davinci_emac.h> |
19 | #include <media/davinci/vpif_types.h> | 19 | #include <media/davinci/vpif_types.h> |
20 | 20 | ||
21 | #define DM646X_EMAC_BASE (0x01C80000) | ||
22 | #define DM646X_EMAC_MDIO_BASE (DM646X_EMAC_BASE + 0x4000) | ||
23 | #define DM646X_EMAC_CNTRL_OFFSET (0x0000) | ||
24 | #define DM646X_EMAC_CNTRL_MOD_OFFSET (0x1000) | ||
25 | #define DM646X_EMAC_CNTRL_RAM_OFFSET (0x2000) | ||
26 | #define DM646X_EMAC_CNTRL_RAM_SIZE (0x2000) | ||
27 | |||
28 | #define DM646X_ASYNC_EMIF_CONTROL_BASE 0x20008000 | 21 | #define DM646X_ASYNC_EMIF_CONTROL_BASE 0x20008000 |
29 | #define DM646X_ASYNC_EMIF_CS2_SPACE_BASE 0x42000000 | 22 | #define DM646X_ASYNC_EMIF_CS2_SPACE_BASE 0x42000000 |
30 | 23 | ||