diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-11-09 16:15:27 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-11-09 16:15:27 -0800 |
| commit | f1587d8660239a4371a73d10a2c56834d7daf6cc (patch) | |
| tree | 93db90355b3ad7d0ae36fc780018fc1f34fcc206 | |
| parent | ac7b931cf83132d1b02a4db626b8acd2e9ea41f0 (diff) | |
| parent | 8aa1802d6a1bd4e4ed7d2d52319a91626d792a70 (diff) | |
Merge "dwc3: gadget: Remove soft reset as part of gadget run_stop"
| -rw-r--r-- | drivers/usb/dwc3/gadget.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 48bfe2aaef1a..a6e13948041e 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -1818,7 +1818,6 @@ static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on, int suspend) { u32 reg; u32 timeout = 500; - ktime_t start, diff; reg = dwc3_readl(dwc->regs, DWC3_DCTL); if (is_on) { @@ -1831,24 +1830,6 @@ static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on, int suspend) if (dwc->revision >= DWC3_REVISION_194A) reg &= ~DWC3_DCTL_KEEP_CONNECT; - start = ktime_get(); - /* issue device SoftReset */ - dwc3_writel(dwc->regs, DWC3_DCTL, reg | DWC3_DCTL_CSFTRST); - do { - reg = dwc3_readl(dwc->regs, DWC3_DCTL); - if (!(reg & DWC3_DCTL_CSFTRST)) - break; - - diff = ktime_sub(ktime_get(), start); - /* poll for max. 10ms */ - if (ktime_to_ms(diff) > DWC3_SOFT_RESET_TIMEOUT) { - printk_ratelimited(KERN_ERR - "%s:core Reset Timed Out\n", __func__); - break; - } - cpu_relax(); - } while (true); - dwc3_event_buffers_setup(dwc); dwc3_gadget_restart(dwc); |