From: Lokesh Vutla <lokeshvutla@ti.com>
Date: Sat, 19 Sep 2015 09:30:16 +0000 (+0530)
Subject: ARM: keystone2: Fix serial port init
X-Git-Tag: v2016.01-rc1~273
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8c80b1937b1b2a06acae5786e8e7c005fe28fd71;p=oweals%2Fu-boot.git

ARM: keystone2: Fix serial port init

With CONFIG_DM_SERIAL is enabled NS16550_init() cannot be
called directly. Driver probe should be taking care of this.
So call this function only when DM_SERIAL is not enabled.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---

diff --git a/arch/arm/mach-keystone/init.c b/arch/arm/mach-keystone/init.c
index a9a7d41160..678afb16e1 100644
--- a/arch/arm/mach-keystone/init.c
+++ b/arch/arm/mach-keystone/init.c
@@ -122,8 +122,10 @@ int arch_cpu_init(void)
 	 * UART register PWREMU_MGMT is initialized. Linux UART
 	 * driver doesn't handle this.
 	 */
+#ifndef CONFIG_DM_SERIAL
 	NS16550_init((NS16550_t)(CONFIG_SYS_NS16550_COM2),
 		     CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE);
+#endif
 
 	return 0;
 }