diff options
author | Kevin Hilman <khilman@deeprootsystems.com> | 2009-07-08 11:32:27 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@deeprootsystems.com> | 2009-08-26 03:57:01 -0400 |
commit | baf09a4cd029c10fd46ef3d1505e2fe8cddcb48e (patch) | |
tree | c382e1f1e1183de1792715a06e46fae658f238cd /arch/arm/mach-davinci/include/mach | |
parent | 9eb7115bcc423ae022ebf1844820d58a77c2d435 (diff) |
davinci: da830: updates for mach-type name change
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-davinci/include/mach')
-rw-r--r-- | arch/arm/mach-davinci/include/mach/debug-macro.S | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/uncompress.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/include/mach/debug-macro.S b/arch/arm/mach-davinci/include/mach/debug-macro.S index 69837a67d5f5..9d16277b233f 100644 --- a/arch/arm/mach-davinci/include/mach/debug-macro.S +++ b/arch/arm/mach-davinci/include/mach/debug-macro.S | |||
@@ -26,7 +26,7 @@ | |||
26 | movne \rx, #0xfe000000 @ virtual base | 26 | movne \rx, #0xfe000000 @ virtual base |
27 | #if defined(CONFIG_ARCH_DAVINCI_DA8XX) && defined(CONFIG_ARCH_DAVINCI_DMx) | 27 | #if defined(CONFIG_ARCH_DAVINCI_DA8XX) && defined(CONFIG_ARCH_DAVINCI_DMx) |
28 | #error Cannot enable DaVinci and DA8XX platforms concurrently | 28 | #error Cannot enable DaVinci and DA8XX platforms concurrently |
29 | #elif defined(CONFIG_MACH_DAVINCI_DA8XX_EVM) | 29 | #elif defined(CONFIG_MACH_DAVINCI_DA830_EVM) |
30 | orr \rx, \rx, #0x00d00000 @ physical base address | 30 | orr \rx, \rx, #0x00d00000 @ physical base address |
31 | orr \rx, \rx, #0x0000d000 @ of UART 2 | 31 | orr \rx, \rx, #0x0000d000 @ of UART 2 |
32 | #else | 32 | #else |
diff --git a/arch/arm/mach-davinci/include/mach/uncompress.h b/arch/arm/mach-davinci/include/mach/uncompress.h index 0f1f12b67875..46a0c3171e35 100644 --- a/arch/arm/mach-davinci/include/mach/uncompress.h +++ b/arch/arm/mach-davinci/include/mach/uncompress.h | |||
@@ -21,7 +21,7 @@ static u32 *uart; | |||
21 | 21 | ||
22 | static u32 *get_uart_base(void) | 22 | static u32 *get_uart_base(void) |
23 | { | 23 | { |
24 | if (__machine_arch_type == MACH_TYPE_DAVINCI_DA8XX_EVM) | 24 | if (__machine_arch_type == MACH_TYPE_DAVINCI_DA830_EVM) |
25 | return (u32 *)DA8XX_UART2_BASE; | 25 | return (u32 *)DA8XX_UART2_BASE; |
26 | else | 26 | else |
27 | return (u32 *)DAVINCI_UART0_BASE; | 27 | return (u32 *)DAVINCI_UART0_BASE; |