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 <hs@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Tom Rini <tom.rini@gmail.com> Cc: Christian Riesch <christian.riesch@omicron.at>

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 <hs@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Tom Rini <tom.rini@gmail.com> Cc: Christian Riesch <christian.riesch@omicron.at>
Heiko Schocher · Tom Rini
1 parent 7f442e36f1
Showing 1 changed file with 4 additions and 0 deletions Side-by-side Diff
arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c
@@ -299,7 +299,11 @@
 	 */
 	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();
...	...	@@ -299,7 +299,11 @@
299	299	*/
300	300	writel((DAVINCI_UART_PWREMU_MGMT_FREE \| DAVINCI_UART_PWREMU_MGMT_URRST \|
301	301	DAVINCI_UART_PWREMU_MGMT_UTRST),
	302	+#if (CONFIG_SYS_NS16550_COM1 == DAVINCI_UART0_BASE)
	303	+ &davinci_uart0_ctrl_regs->pwremu_mgmt);
	304	+#else
302	305	&davinci_uart2_ctrl_regs->pwremu_mgmt);
	306	+#endif
303	307
304	308	#if defined(CONFIG_SYS_DA850_DDR_INIT)
305	309	da850_ddr_setup();