From: lyz <lyz@rock-chips.com>
Date: Thu, 7 Mar 2013 09:50:02 +0000 (+0800)
Subject: rk292x : usb : exit_phy_hi-z_when_check_dpdm
X-Git-Tag: firefly_0821_release~7454
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=791601632671b49a87381d7f7666fff160eacd26;p=firefly-linux-kernel-4.4.55.git

rk292x : usb : exit_phy_hi-z_when_check_dpdm
---

diff --git a/drivers/usb/dwc_otg/usbdev_rk2928.c b/drivers/usb/dwc_otg/usbdev_rk2928.c
index 452001c7cd1c..ce07da1d78fe 100755
--- a/drivers/usb/dwc_otg/usbdev_rk2928.c
+++ b/drivers/usb/dwc_otg/usbdev_rk2928.c
@@ -54,18 +54,20 @@ int dwc_otg_check_dpdm(void)
         }
     }
     mdelay(105);
-    printk("regbase %p 0x%x, otg_phy_con%p, 0x%x\n",
-        reg_base, *(reg_base), otg_phy_con1, *otg_phy_con1);
+    //printk("regbase %p 0x%x, otg_phy_con%p, 0x%x\n",
+    //    reg_base, *(reg_base), otg_phy_con1, *otg_phy_con1);
     otg_dctl = (unsigned int * )(reg_base+0x804);
     otg_gotgctl = (unsigned int * )(reg_base);
     otg_hprt0 = (unsigned int * )(reg_base + DWC_OTG_HOST_PORT_REGS_OFFSET);
     if(*otg_gotgctl &(1<<19)){
         bus_status = 1;
-        *otg_dctl &= ~(0x01<<1);//@lyz exit soft-disconnect mode
-        mdelay(50);    // delay about 10ms
+        *(unsigned int*)(RK2928_GRF_BASE + GRF_UOC0_CON0) = 0x10000000;//exit usbphy io hi-z state
+        *otg_dctl &= ~(0x01<<1);//exit soft-disconnect mode
+        mdelay(1);    // delay about 1ms
     // check dp,dm
-        if((*otg_hprt0 & 0xc00)==0xc00)//@lyz check hprt[11:10] 
+        if((*otg_hprt0 & 0xc00)==0xc00)//check hprt[11:10] 
             bus_status = 2;
+        *(unsigned int*)(RK2928_GRF_BASE + GRF_UOC0_CON0) = 0x10001000;
     }
 out:
     return bus_status;