From 9c8deaeeb79523d45d836c730c59c857f53b5f65 Mon Sep 17 00:00:00 2001 From: Heiko Schocher Date: Mon, 5 Aug 2013 16:00:37 +0200 Subject: arm, da850: enable the correct uart in arch_cpu_init() in arch_cpu_init() uart2 is fix enabled, without reference the setting from CONFIG_SYS_NS16550_COM1. Use the setting from CONFIG_SYS_NS16550_COM1 for enabling the console. Signed-off-by: Heiko Schocher Cc: Albert ARIBAUD Cc: Tom Rini Cc: Christian Riesch --- arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'arch/arm/cpu/arm926ejs/davinci') diff --git a/arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c b/arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c index f6bf1ef8cb..a3bbbb869d 100644 --- a/arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c +++ b/arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c @@ -299,7 +299,11 @@ int arch_cpu_init(void) */ writel((DAVINCI_UART_PWREMU_MGMT_FREE | DAVINCI_UART_PWREMU_MGMT_URRST | DAVINCI_UART_PWREMU_MGMT_UTRST), +#if (CONFIG_SYS_NS16550_COM1 == DAVINCI_UART0_BASE) + &davinci_uart0_ctrl_regs->pwremu_mgmt); +#else &davinci_uart2_ctrl_regs->pwremu_mgmt); +#endif #if defined(CONFIG_SYS_DA850_DDR_INIT) da850_ddr_setup(); -- cgit