summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Loureiro <joaofl@gmail.com>2021-03-17 16:52:21 +0100
committerMarek Vasut <marex@denx.de>2021-06-09 10:54:26 +0200
commitdcd2bbe0510d7d47d745eeea063496a83cb3b08e (patch)
tree67f60ff5b88a5d31f803e81f39608443b61009f6
parentc2d21e0ac087a153f1c4632e4ce46668bbf83633 (diff)
downloadu-boot-dcd2bbe0510d7d47d745eeea063496a83cb3b08e.tar.gz
u-boot-dcd2bbe0510d7d47d745eeea063496a83cb3b08e.tar.xz
u-boot-dcd2bbe0510d7d47d745eeea063496a83cb3b08e.zip
usb: dwc2: Avoid delay when initializing USB peripheral by dwc2
When `usb start` is called on the terminal, the dwc2 driver will try to start every USB device as host first, even if it is explicitly configured as peripheral in the device tree (dr_mode = "peripheral"). So to avoid an unwanted 15 seconds delay when initializing the usb (one second per channel = 1s x 15), this patch adds a check to the initialization, and will skip host initialization of the device is explicitly set as peripheral. The checking is already done similarly in the `drivers/usb/gadget/dwc2_udc_otg.c` driver. Signed-off-by: João Loureiro <joaofl@gmail.com>
-rw-r--r--drivers/usb/host/dwc2.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c
index ec643e9f45..43cc2e0433 100644
--- a/drivers/usb/host/dwc2.c
+++ b/drivers/usb/host/dwc2.c
@@ -21,6 +21,7 @@
#include <asm/io.h>
#include <dm/device_compat.h>
#include <linux/delay.h>
+#include <linux/usb/otg.h>
#include <power/regulator.h>
#include <reset.h>
@@ -1204,7 +1205,13 @@ static int dwc2_init_common(struct udevice *dev, struct dwc2_priv *priv)
#endif
dwc_otg_core_init(dev);
- dwc_otg_core_host_init(dev, regs);
+
+ if (usb_get_dr_mode(dev_ofnode(dev)) == USB_DR_MODE_PERIPHERAL) {
+ dev_dbg(dev, "USB device %s dr_mode set to %d. Skipping host_init.\n",
+ dev->name, usb_get_dr_mode(dev_ofnode(dev)));
+ } else {
+ dwc_otg_core_host_init(dev, regs);
+ }
clrsetbits_le32(&regs->hprt0, DWC2_HPRT0_PRTENA |
DWC2_HPRT0_PRTCONNDET | DWC2_HPRT0_PRTENCHNG |