Skip to content

L
linux-davinci
Commit baf09a4c authored by Kevin Hilman's avatar Kevin Hilman
Browse files
Options

davinci: da830: updates for mach-type name change 

Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent 9eb7115b
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
arch/arm/mach-davinci/board-da830-evm.c
View file @ baf09a4c
...@@ -116,7 +116,7 @@ static void __init da830_evm_map_io(void) ...@@ -116,7 +116,7 @@ static void __init da830_evm_map_io(void)
da830_init(); da830_init();
} }
MACHINE_START(DAVINCI_DA8XX_EVM, "DaVinci DA830/OMAP L137 EVM") MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP L137 EVM")
.phys_io = IO_PHYS, .phys_io = IO_PHYS,
.io_pg_offst = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc, .io_pg_offst = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,
.boot_params = (DA8XX_DDR_BASE + 0x100), .boot_params = (DA8XX_DDR_BASE + 0x100),
......
arch/arm/mach-davinci/include/mach/debug-macro.S
View file @ baf09a4c
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
movne \rx, #0xfe000000 @ virtual base movne \rx, #0xfe000000 @ virtual base
#if defined(CONFIG_ARCH_DAVINCI_DA8XX) && defined(CONFIG_ARCH_DAVINCI_DMx) #if defined(CONFIG_ARCH_DAVINCI_DA8XX) && defined(CONFIG_ARCH_DAVINCI_DMx)
#error Cannot enable DaVinci and DA8XX platforms concurrently #error Cannot enable DaVinci and DA8XX platforms concurrently
#elif defined(CONFIG_MACH_DAVINCI_DA8XX_EVM) #elif defined(CONFIG_MACH_DAVINCI_DA830_EVM)
orr \rx, \rx, #0x00d00000 @ physical base address orr \rx, \rx, #0x00d00000 @ physical base address
orr \rx, \rx, #0x0000d000 @ of UART 2 orr \rx, \rx, #0x0000d000 @ of UART 2
#else #else
......
arch/arm/mach-davinci/include/mach/uncompress.h
View file @ baf09a4c
...@@ -21,7 +21,7 @@ static u32 *uart; ...@@ -21,7 +21,7 @@ static u32 *uart;
static u32 *get_uart_base(void) static u32 *get_uart_base(void)
{ {
if (__machine_arch_type == MACH_TYPE_DAVINCI_DA8XX_EVM) if (__machine_arch_type == MACH_TYPE_DAVINCI_DA830_EVM)
return (u32 *)DA8XX_UART2_BASE; return (u32 *)DA8XX_UART2_BASE;
else else
return (u32 *)DAVINCI_UART0_BASE; return (u32 *)DAVINCI_UART0_BASE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment