diff options
| author | Jules Maselbas <jmaselbas@kalray.eu> | 2021-03-12 17:24:32 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-03-15 09:51:33 +0100 |
| commit | 26459ab7803a3321adb1289535ca5d0e7b706c26 (patch) | |
| tree | f76da0206429e7ca2765425f3592ee885df27fc1 | |
| parent | 5d417e1b8bd22df8e9e318b28d17c56bf8fadb7e (diff) | |
| download | barebox-26459ab7803a3321adb1289535ca5d0e7b706c26.tar.gz barebox-26459ab7803a3321adb1289535ca5d0e7b706c26.tar.xz | |
usb: dwc2: Rework wait for host mode during core reset
Replace the unconditional delay of 100ms during core_reset by
a call to dwc2_wait_for_mode() when iddig filter is enabled,
as done in Linux.
The uses of mdelay comes from the porting of u-boot's driver.
Cc: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Jules Maselbas <jmaselbas@kalray.eu>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/usb/dwc2/core.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c index 24efe5a412..5d04a07b03 100644 --- a/drivers/usb/dwc2/core.c +++ b/drivers/usb/dwc2/core.c @@ -764,16 +764,16 @@ int dwc2_core_reset(struct dwc2 *dwc2) * Determine whether we will go back into host mode after a * reset and account for this delay after the reset. */ - { - u32 gotgctl = dwc2_readl(dwc2, GOTGCTL); - u32 gusbcfg = dwc2_readl(dwc2, GUSBCFG); - - if (!(gotgctl & GOTGCTL_CONID_B) || - (gusbcfg & GUSBCFG_FORCEHOSTMODE)) { - dwc2_dbg(dwc2, "HOST MODE\n"); - wait_for_host_mode = true; - } + if (dwc2_iddig_filter_enabled(dwc2)) { + u32 gotgctl = dwc2_readl(dwc2, GOTGCTL); + u32 gusbcfg = dwc2_readl(dwc2, GUSBCFG); + + if (!(gotgctl & GOTGCTL_CONID_B) || + (gusbcfg & GUSBCFG_FORCEHOSTMODE)) { + wait_for_host_mode = true; + } } + /* Core Soft Reset */ greset = dwc2_readl(dwc2, GRSTCTL); greset |= GRSTCTL_CSFTRST; @@ -786,12 +786,8 @@ int dwc2_core_reset(struct dwc2 *dwc2) return ret; } - /* - * Wait for core to come out of reset. - * NOTE: This long sleep is _very_ important, otherwise the core will - * not stay in host mode after a connector ID change! - */ - mdelay(100); + if (wait_for_host_mode) + dwc2_wait_for_mode(dwc2, wait_for_host_mode); return 0; } |