diff options
| author | Kevin Hilman <khilman@deeprootsystems.com> | 2010-10-21 14:21:55 -0400 |
|---|---|---|
| committer | Kevin Hilman <khilman@deeprootsystems.com> | 2010-10-21 14:21:55 -0400 |
| commit | 7940a34b2e1e0485211a17d8c3ab4da1ea3e1330 (patch) | |
| tree | fe08ba701cbf23ae44a16d3b7afa521fce943a8a /arch/arm/mach-davinci/include/mach/dm365.h | |
| parent | 6451d7783ba5ff24eb1a544eaa6665b890f30466 (diff) | |
| parent | 8939b3504dc35224cb9c88e5af925b22ea9eee71 (diff) | |
Merge branch 'davinci-next' into davinci-for-linus
Conflicts:
arch/arm/mach-davinci/board-da830-evm.c
arch/arm/mach-davinci/board-da850-evm.c
Diffstat (limited to 'arch/arm/mach-davinci/include/mach/dm365.h')
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/dm365.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/include/mach/dm365.h b/arch/arm/mach-davinci/include/mach/dm365.h index ea5df3b49ec4..2563bf4e93a1 100644 --- a/arch/arm/mach-davinci/include/mach/dm365.h +++ b/arch/arm/mach-davinci/include/mach/dm365.h | |||
| @@ -21,10 +21,10 @@ | |||
| 21 | #include <media/davinci/vpfe_capture.h> | 21 | #include <media/davinci/vpfe_capture.h> |
| 22 | 22 | ||
| 23 | #define DM365_EMAC_BASE (0x01D07000) | 23 | #define DM365_EMAC_BASE (0x01D07000) |
| 24 | #define DM365_EMAC_MDIO_BASE (DM365_EMAC_BASE + 0x4000) | ||
| 24 | #define DM365_EMAC_CNTRL_OFFSET (0x0000) | 25 | #define DM365_EMAC_CNTRL_OFFSET (0x0000) |
| 25 | #define DM365_EMAC_CNTRL_MOD_OFFSET (0x3000) | 26 | #define DM365_EMAC_CNTRL_MOD_OFFSET (0x3000) |
| 26 | #define DM365_EMAC_CNTRL_RAM_OFFSET (0x1000) | 27 | #define DM365_EMAC_CNTRL_RAM_OFFSET (0x1000) |
| 27 | #define DM365_EMAC_MDIO_OFFSET (0x4000) | ||
| 28 | #define DM365_EMAC_CNTRL_RAM_SIZE (0x2000) | 28 | #define DM365_EMAC_CNTRL_RAM_SIZE (0x2000) |
| 29 | 29 | ||
| 30 | /* Base of key scan register bank */ | 30 | /* Base of key scan register bank */ |