leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge https://source.denx.de/u-boot/custodians/u-boot-usb

Browse Source
This commit is contained in:
Tom Rini 2021-05-16 18:06:26 -04:00
commit 7e1d0a8f17
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/usb/dwc3/dwc3-generic.c
View File

@ -163,7 +163,8 @@ U_BOOT_DRIVER(dwc3_generic_peripheral) = {
};
#endif
#if defined(CONFIG_SPL_USB_HOST_SUPPORT) || !defined(CONFIG_SPL_BUILD)
#if defined(CONFIG_SPL_USB_HOST_SUPPORT) || \
!defined(CONFIG_SPL_BUILD) && defined(CONFIG_USB_HOST)
static int dwc3_generic_host_probe(struct udevice *dev)
{
struct xhci_hcor *hcor;

10
drivers/usb/musb-new/Kconfig
View File

@ -89,3 +89,13 @@ config USB_MUSB_PIO_ONLY
help
All data is copied between memory and FIFO by the CPU.
DMA controllers are ignored.
config USB_MUSB_FIXED_CONFIGDATA
bool "Hardcode MUSB CONFIGDATA register"
depends on USB_MUSB_SUNXI
default n if MACH_SUN4I || MACH_SUN5I || MACH_SUN6I || MACH_SUN7I || MACH_SUN8I_A23
default y
help
Newer Allwinner SoCs do not implement the MUSB_CONFIGDATA register,
so it always reads 0. Select this option to override this and
return a hardcoded value instead.

3
drivers/usb/musb-new/musb_regs.h
View File

@ -431,8 +431,7 @@ static inline u8 musb_read_ulpi_buscontrol(void __iomem *mbase)
static inline u8 musb_read_configdata(void __iomem *mbase)
{
#if defined CONFIG_MACH_SUN8I_A33 || defined CONFIG_MACH_SUN8I_A83T || \
defined CONFIG_MACH_SUNXI_H3_H5 || defined CONFIG_MACH_SUN50I
#ifdef CONFIG_USB_MUSB_FIXED_CONFIGDATA
/* <Sigh> allwinner saves a reg, and we need to hardcode this */
return 0xde;
#else