aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/board-da850-evm.c
diff options
context:
space:
mode:
authorMichael Williamson <michael.williamson@criticallink.com>2010-08-31 14:30:15 -0400
committerKevin Hilman <khilman@deeprootsystems.com>2010-09-24 07:40:27 -0700
commit1aa5f2a9c1575279baf06e94a4bd3b3b86b7f176 (patch)
treeb3e29cf4347dc3cd48ddb534ff187db64fbf7584 /arch/arm/mach-davinci/board-da850-evm.c
parentdavinci: dm6467t evm: setup NAND flash timing (diff)
downloadlinux-dev-1aa5f2a9c1575279baf06e94a4bd3b3b86b7f176.tar.xz
linux-dev-1aa5f2a9c1575279baf06e94a4bd3b3b86b7f176.zip
davinci: Add machine checks to DA8XX serial console init routines
This patch adds machine checks in the serial console init routines for the DA8XX EVM boards. This is needed because there are other DA8XX based machines that use a different UART/tty as the console and may be included in a common kernel build. Signed-off-by: Michael Williamson <michael.williamson@criticallink.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-davinci/board-da850-evm.c')
-rw-r--r--arch/arm/mach-davinci/board-da850-evm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index c1d45d7ac45b..ac2297c69a92 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -859,6 +859,9 @@ static __init void da850_evm_init(void)
#ifdef CONFIG_SERIAL_8250_CONSOLE
static int __init da850_evm_console_init(void)
{
+ if (!machine_is_davinci_da850_evm())
+ return 0;
+
return add_preferred_console("ttyS", 2, "115200");
}
console_initcall(da850_evm_console_init);