]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
ARM: keystone2: Fix serial port init
authorLokesh Vutla <lokeshvutla@ti.com>
Sat, 19 Sep 2015 09:30:16 +0000 (15:00 +0530)
committerTom Rini <trini@konsulko.com>
Thu, 22 Oct 2015 18:19:49 +0000 (14:19 -0400)
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>
arch/arm/mach-keystone/init.c

index a9a7d41160126e571ff073575c787a453df7a044..678afb16e12f8b28db4c5063712af5231a5c5b15 100644 (file)
@@ -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;
 }