From fe61da8c75d061f48237ef4d7618812739ccf789 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Wed, 25 Jan 2023 19:40:15 +0100 Subject: usb: USB hubs require host mode USB hubs run in host mode not in gadget mode. Hence, compiling usb_hub.c should not be selected by CONFIG_USB_GADGET. Suggested-by: Marek Vasut Signed-off-by: Heinrich Schuchardt Reviewed-by: Marek Vasut --- common/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/Makefile b/common/Makefile index 252e965..a50302d 100644 --- a/common/Makefile +++ b/common/Makefile @@ -24,7 +24,7 @@ obj-$(CONFIG_CMD_MII) += miiphyutil.o obj-$(CONFIG_PHYLIB) += miiphyutil.o obj-$(CONFIG_USB_HOST) += usb.o usb_hub.o -obj-$(CONFIG_USB_GADGET) += usb.o usb_hub.o +obj-$(CONFIG_USB_GADGET) += usb.o obj-$(CONFIG_USB_STORAGE) += usb_storage.o obj-$(CONFIG_USB_ONBOARD_HUB) += usb_onboard_hub.o -- cgit v1.1 From 4042ce73c8bee9077d80a42b27aa21f98636b780 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Wed, 25 Jan 2023 19:40:16 +0100 Subject: usb: move CONFIG_USB_HUB_DEBOUNCE_TIMEOUT to USB This configuration setting is only relevant if the board supports USB. It should not be in the main menu but in the USB menu. The setting is only relevant in USB host mode. Fixes: 5454dea3137d ("usb: hub: allow to increase HUB_DEBOUNCE_TIMEOUT") Signed-off-by: Heinrich Schuchardt Reviewed-by: Marek Vasut Reviewed-by: Patrick Delaunay --- common/Kconfig | 12 ------------ drivers/usb/Kconfig | 11 +++++++++++ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/common/Kconfig b/common/Kconfig index e3a5e1b..0afc01b 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1106,15 +1106,3 @@ config FDT_SIMPLEFB config IO_TRACE bool - -config USB_HUB_DEBOUNCE_TIMEOUT - int "Timeout in milliseconds for USB HUB connection" - depends on USB - default 1000 - help - Value in milliseconds of the USB connection timeout, the max delay to - wait the hub port status to be connected steadily after being powered - off and powered on in the usb hub driver. - This define allows to increase the HUB_DEBOUNCE_TIMEOUT default - value = 1s because some usb device needs around 1.5s to be initialized - and a 2s value should solve detection issue on problematic USB keys. diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index ebe6bf9..94fb32d 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -115,6 +115,17 @@ config USB_ONBOARD_HUB power regulator. An example for such a hub is the Microchip USB2514B. +config USB_HUB_DEBOUNCE_TIMEOUT + int "Timeout in milliseconds for USB HUB connection" + default 1000 + help + Value in milliseconds of the USB connection timeout, the max delay to + wait the hub port status to be connected steadily after being powered + off and powered on in the usb hub driver. + This define allows to increase the HUB_DEBOUNCE_TIMEOUT default + value = 1s because some usb device needs around 1.5s to be initialized + and a 2s value should solve detection issue on problematic USB keys. + if USB_KEYBOARD config USB_KEYBOARD_FN_KEYS -- cgit v1.1