From: wdc <wdc@rock-chips.com>
Date: Sat, 12 Jul 2014 07:24:39 +0000 (+0800)
Subject: 3036: open usb uart init
X-Git-Tag: firefly_0821_release~4916^2~252
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3925d5e56b2f82bb81b554d74f0a36158c012506;p=firefly-linux-kernel-4.4.55.git

3036: open usb uart init
---

diff --git a/arch/arm/mach-rockchip/rk3036.c b/arch/arm/mach-rockchip/rk3036.c
index 4ff1ecefda72..72317f89e002 100755
--- a/arch/arm/mach-rockchip/rk3036.c
+++ b/arch/arm/mach-rockchip/rk3036.c
@@ -82,7 +82,6 @@ static void __init rk3036_boot_mode_init(void)
     rockchip_boot_mode_init(flag, mode);
 }
 
-#if 0
 static void usb_uart_init(void)
 {
 #ifdef CONFIG_RK_USB_UART
@@ -106,7 +105,6 @@ static void usb_uart_init(void)
     writel_relaxed(0x03, RK_DEBUG_UART_VIRT + 0x0c);
 #endif //end of DEBUG_UART_BASE
 }
-#endif
 
 static void __init rk3036_dt_map_io(void)
 {
@@ -114,7 +112,7 @@ static void __init rk3036_dt_map_io(void)
 
     iotable_init(rk3036_io_desc, ARRAY_SIZE(rk3036_io_desc));
     debug_ll_io_init();
-    //usb_uart_init();
+    usb_uart_init();
 
     /* enable timer5 for core */
     writel_relaxed(0, RK3036_TIMER5_VIRT + 0x10);