diff options
| author | Tom Rini | 2022-07-19 15:54:57 -0400 |
|---|---|---|
| committer | Tom Rini | 2022-07-19 15:54:57 -0400 |
| commit | 319d309b58f863cbb8dcb240ace6af17dc98939b (patch) | |
| tree | 07a51c848628af4540c1afcd2a252d3fda4c5c74 /drivers | |
| parent | 5eefa9344b0a46f97c97fbbb35ac17bd9a4c6f2a (diff) | |
| parent | 9674c09b7495d15017b68a3d462b17040c12ff70 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-usb
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/dwc3/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/usb/dwc3/Makefile | 2 | ||||
| -rw-r--r-- | drivers/usb/musb-new/sunxi.c | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig index 62aa65bf0cd..f010291d022 100644 --- a/drivers/usb/dwc3/Kconfig +++ b/drivers/usb/dwc3/Kconfig @@ -30,6 +30,13 @@ config USB_DWC3_GENERIC Select this for Xilinx ZynqMP and similar Platforms. This wrapper supports Host and Peripheral operation modes. +config SPL_USB_DWC3_GENERIC + bool "Generic implementation of a DWC3 wrapper (aka dwc3 glue) for the SPL" + depends on SPL_DM_USB && USB_DWC3 && SPL_MISC + help + Select this for Xilinx ZynqMP and similar Platforms. + This wrapper supports Host and Peripheral operation modes. + config USB_DWC3_MESON_G12A bool "Amlogic Meson G12A USB wrapper" depends on DM_USB && USB_DWC3 && ARCH_MESON diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile index 0dd1ba87cd9..97b4f7191ca 100644 --- a/drivers/usb/dwc3/Makefile +++ b/drivers/usb/dwc3/Makefile @@ -9,7 +9,7 @@ obj-$(CONFIG_USB_DWC3_GADGET) += gadget.o ep0.o obj-$(CONFIG_USB_DWC3_OMAP) += dwc3-omap.o obj-$(CONFIG_USB_DWC3_MESON_G12A) += dwc3-meson-g12a.o obj-$(CONFIG_USB_DWC3_MESON_GXL) += dwc3-meson-gxl.o -obj-$(CONFIG_USB_DWC3_GENERIC) += dwc3-generic.o +obj-$(CONFIG_$(SPL_)USB_DWC3_GENERIC) += dwc3-generic.o obj-$(CONFIG_USB_DWC3_UNIPHIER) += dwc3-uniphier.o obj-$(CONFIG_USB_DWC3_LAYERSCAPE) += dwc3-layerscape.o obj-$(CONFIG_USB_DWC3_PHY_OMAP) += ti_usb_phy.o diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c index 7e62e3fe6ea..dc4cfc2194b 100644 --- a/drivers/usb/musb-new/sunxi.c +++ b/drivers/usb/musb-new/sunxi.c @@ -241,12 +241,6 @@ static int sunxi_musb_enable(struct musb *musb) musb_writeb(musb->mregs, USBC_REG_o_VEND0, 0); if (is_host_enabled(musb)) { - ret = sun4i_usb_phy_vbus_detect(&glue->phy); - if (ret == 1) { - printf("A charger is plugged into the OTG: "); - return -ENODEV; - } - ret = sun4i_usb_phy_id_detect(&glue->phy); if (ret == 1) { printf("No host cable detected: "); |