From: lyz <lyz@rock-chips.com>
Date: Mon, 5 Aug 2013 06:45:17 +0000 (+0800)
Subject: rk3026: usb: set gpio3c1 iomux to usb otg_drv
X-Git-Tag: firefly_0821_release~6749
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=17df9c669db1154c46b30c39a53d2421b59d8758;p=firefly-linux-kernel-4.4.55.git

rk3026: usb: set gpio3c1 iomux to usb otg_drv
---

diff --git a/drivers/usb/dwc_otg/usbdev_rk3026.c b/drivers/usb/dwc_otg/usbdev_rk3026.c
index 2e8dd1a37f09..f68efb9fda9a 100755
--- a/drivers/usb/dwc_otg/usbdev_rk3026.c
+++ b/drivers/usb/dwc_otg/usbdev_rk3026.c
@@ -114,7 +114,7 @@ void usb20otg_hw_init(void)
 #ifdef CONFIG_RK_CONFIG
     otg_drv_init(0);
 #else
-    rk30_mux_api_set(GPIO3_C1, 1);  
+    iomux_set(GPIO3_C1|0x01);  
 #endif
 }
 void usb20otg_phy_suspend(void* pdata, int suspend)
@@ -449,7 +449,7 @@ static irqreturn_t bvalid_irq_handler(int irq, void *dev_id)
     
 #ifdef CONFIG_RK_USB_UART
     /* usb otg dp/dm switch to usb phy */
-    writel_relaxed((3 << (12 + 16)),RK2928_GRF_BASE + GRF_UOC1_CON0);
+    dwc_otg_uart_mode(NULL, PHY_USB_MODE);
 #endif
     
     schedule_delayed_work(&usb_det_wakeup_work, HZ/10);