Commit baf09a4c authored by Kevin Hilman's avatar Kevin Hilman
Browse files

davinci: da830: updates for mach-type name change 



Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent 9eb7115b

arch/arm/mach-davinci/board-da830-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -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),

arch/arm/mach-davinci/include/mach/debug-macro.S

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-davinci/include/mach/uncompress.h

+1 −1
Original line number Diff line number Diff line
@@ -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;