diff mbox

[04/17] davinci: da830: updates for mach-type name change

Message ID 1247869060-10719-5-git-send-email-khilman@deeprootsystems.com (mailing list archive)
State Awaiting Upstream
Headers show

Commit Message

Kevin Hilman July 17, 2009, 10:17 p.m. UTC
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
---
 arch/arm/mach-davinci/board-da830-evm.c          |    2 +-
 arch/arm/mach-davinci/include/mach/debug-macro.S |    2 +-
 arch/arm/mach-davinci/include/mach/uncompress.h  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
diff mbox

Patch

diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index 0409eb6..9185a70 100644
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -116,7 +116,7 @@  static void __init da830_evm_map_io(void)
 	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,
 	.io_pg_offst	= (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,
 	.boot_params	= (DA8XX_DDR_BASE + 0x100),
diff --git a/arch/arm/mach-davinci/include/mach/debug-macro.S b/arch/arm/mach-davinci/include/mach/debug-macro.S
index 69837a6..9d16277 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 @@ 
 		movne	\rx, #0xfe000000	@ virtual base
 #if defined(CONFIG_ARCH_DAVINCI_DA8XX) && defined(CONFIG_ARCH_DAVINCI_DMx)
 #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, #0x0000d000	@ of UART 2
 #else
diff --git a/arch/arm/mach-davinci/include/mach/uncompress.h b/arch/arm/mach-davinci/include/mach/uncompress.h
index 0f1f12b..46a0c31 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;
 
 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;
 	else
 		return (u32 *)DAVINCI_UART0_BASE;