shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

rk3368: usb: reset usb phy when channel halt

Browse Source 
Signed-off-by: lyz <lyz@rock-chips.com>
This commit is contained in:
lyz
2015-08-21 10:58:36 +08:00
parent 4e34962ad0
commit b1f2f58695
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/usb/dwc_otg_310/dwc_otg_hcd_intr.c
View File

@@ -35,6 +35,8 @@
#include "dwc_otg_hcd.h"
#include "dwc_otg_regs.h"
#include <linux/usb.h>
#include "dwc_otg_driver.h"
#include "usbdev_rk.h"
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
#include <../drivers/usb/core/hcd.h>
#else
@@ -1922,6 +1924,7 @@ static void handle_hc_chhltd_intr_dma(dwc_otg_hcd_t *hcd,
hcint_data_t hcint;
hcintmsk_data_t hcintmsk;
int out_nak_enh = 0;
struct dwc_otg_platform_data *pldata = hcd->core_if->otg_dev->pldata;
/* For core with OUT NAK enhancement, the flow for high-
* speed CONTROL/BULK OUT is handled a little differently.
@@ -2049,6 +2052,8 @@ static void handle_hc_chhltd_intr_dma(dwc_otg_hcd_t *hcd,
} else {
DWC_PRINTF("NYET/NAK/ACK/other in non-error case, 0x%08x\n",
hcint.d32);
pldata->soft_reset(pldata, RST_CHN_HALT);
mdelay(5);
if (!hcint.b.nyet && !hcint.b.nak && !hcint.b.ack)
clear_hc_int(hc_regs, chhltd);
}

11
drivers/usb/dwc_otg_310/usbdev_rk3368.c
View File

@@ -79,7 +79,16 @@ static void usb20otg_soft_reset(void *pdata, enum rkusb_rst_flag rst_type)
reset_control_deassert(rst_otg_c);
reset_control_deassert(rst_otg_h);
break;
case RST_CHN_HALT:
/* PHY reset */
uoc_write(UOC_HIWORD_UPDATE(0x1, 0x3, 0), 0x700);
reset_control_assert(rst_otg_p);
udelay(15);
uoc_write(UOC_HIWORD_UPDATE(0x2, 0x3, 0), 0x700);
udelay(1500);
reset_control_deassert(rst_otg_p);
udelay(2);
break;
default:
break;
}