diff options
| author | Tom Rini <trini@konsulko.com> | 2022-07-14 11:10:49 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-07-14 11:10:49 -0400 |
| commit | 54f683dbfb8b0777ee4d0ba00872da33e54c98fa (patch) | |
| tree | 2bf9b2cb071abd2a9a80a252fc0126f1df46cfec /common | |
| parent | 58f3dc5c4eac9c6050edda6af2e37d20a2f9586d (diff) | |
| parent | 16aabfe2f29d4682b2176095029fa307caccaced (diff) | |
| download | u-boot-54f683dbfb8b0777ee4d0ba00872da33e54c98fa.tar.gz | |
Merge https://source.denx.de/u-boot/custodians/u-boot-usbWIP/14Jul2022
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl_sdp.c | 2 | ||||
| -rw-r--r-- | common/usb_hub.c | 6 | ||||
| -rw-r--r-- | common/usb_kbd.c | 25 |
3 files changed, 18 insertions, 15 deletions
diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c index 36c31aff099..cc4fb4f7cca 100644 --- a/common/spl/spl_sdp.c +++ b/common/spl/spl_sdp.c @@ -19,7 +19,7 @@ static int spl_sdp_load_image(struct spl_image_info *spl_image, usb_gadget_initialize(controller_index); - board_usb_init(0, USB_INIT_DEVICE); + board_usb_init(controller_index, USB_INIT_DEVICE); g_dnl_clear_detach(); ret = g_dnl_register("usb_dnl_sdp"); diff --git a/common/usb_hub.c b/common/usb_hub.c index ba11a188ca6..d73638950b9 100644 --- a/common/usb_hub.c +++ b/common/usb_hub.c @@ -47,6 +47,8 @@ #define HUB_SHORT_RESET_TIME 20 #define HUB_LONG_RESET_TIME 200 +#define HUB_DEBOUNCE_TIMEOUT 1000 + #define PORT_OVERCURRENT_MAX_SCAN_COUNT 3 struct usb_device_scan { @@ -208,10 +210,10 @@ static void usb_hub_power_on(struct usb_hub_device *hub) * will be done based on this value in the USB port loop in * usb_hub_configure() later. */ - hub->connect_timeout = hub->query_delay + 1000; + hub->connect_timeout = hub->query_delay + HUB_DEBOUNCE_TIMEOUT; debug("devnum=%d poweron: query_delay=%d connect_timeout=%d\n", dev->devnum, max(100, (int)pgood_delay), - max(100, (int)pgood_delay) + 1000); + max(100, (int)pgood_delay) + HUB_DEBOUNCE_TIMEOUT); } #if !CONFIG_IS_ENABLED(DM_USB) diff --git a/common/usb_kbd.c b/common/usb_kbd.c index 352d86fb2ec..d385bea532e 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -581,21 +581,22 @@ static int probe_usb_keyboard(struct usb_device *dev) stdinname = env_get("stdin"); #if CONFIG_IS_ENABLED(CONSOLE_MUX) - error = iomux_doenv(stdin, stdinname); - if (error) - return error; + if (strstr(stdinname, DEVNAME) != NULL) { + error = iomux_doenv(stdin, stdinname); + if (error) + return error; + } #else /* Check if this is the standard input device. */ - if (strcmp(stdinname, DEVNAME)) - return 1; - - /* Reassign the console */ - if (overwrite_console()) - return 1; + if (!strcmp(stdinname, DEVNAME)) { + /* Reassign the console */ + if (overwrite_console()) + return 1; - error = console_assign(stdin, DEVNAME); - if (error) - return error; + error = console_assign(stdin, DEVNAME); + if (error) + return error; + } #endif return 0; |