disable usb uart debug by default

diff --git a/arch/arm/plat-rk/Kconfig b/arch/arm/plat-rk/Kconfig
index 841a698a6d5a463fbdb7b5773431df75d9f770ff..a1a1ec1e54836a9cad4f124559895811e3dabd89 100755 (executable)
--- 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 (file)
new mode 100755 (executable)
index 267ce25..3d5dbcd
--- 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();