From: yangkai <yk@rock-chips.com>
Date: Tue, 11 Sep 2012 07:54:35 +0000 (+0800)
Subject: disable usb uart debug by default
X-Git-Tag: firefly_0821_release~8656
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=17567c86c451eb1c56488ca6320d430eb4f6e6ff;p=firefly-linux-kernel-4.4.55.git

disable usb uart debug by default
---

diff --git a/arch/arm/plat-rk/Kconfig b/arch/arm/plat-rk/Kconfig
index 841a698a6d5a..a1a1ec1e5483 100755
--- a/arch/arm/plat-rk/Kconfig
+++ b/arch/arm/plat-rk/Kconfig
@@ -166,7 +166,7 @@ config RK_DEBUG_UART
 config RK_USB_UART
 	bool "Support USB UART Bypass Function"
 	depends on ARCH_RK2928 && (RK_DEBUG_UART = 2)
-	default y
+	default n
 
 config RK_CONSOLE_THREAD
 	bool "Console write by thread"
diff --git a/arch/arm/plat-rk/usb_detect.c b/arch/arm/plat-rk/usb_detect.c
old mode 100644
new mode 100755
index 267ce2546168..3d5dbcdfd35b
--- a/arch/arm/plat-rk/usb_detect.c
+++ b/arch/arm/plat-rk/usb_detect.c
@@ -84,6 +84,10 @@ static irqreturn_t bvalid_irq_handler(int irq, void *dev_id)
 #ifdef CONFIG_ARCH_RK2928
 	writel_relaxed((1 << 31) | (1 << 15), RK2928_GRF_BASE + GRF_UOC0_CON5);
 #endif
+#ifdef CONFIG_RK_USB_UART 
+    /* usb otg dp/dm switch to usb phy */
+    writel_relaxed((3 << (12 + 16)),RK2928_GRF_BASE + GRF_UOC1_CON4);
+#endif
 
 	wake_lock_timeout(&usb_wakelock, WAKE_LOCK_TIMEOUT);
 	rk28_send_wakeup_key();