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 
- 3 important fixes
This commit is contained in:
Tom Rini 2022-11-04 11:19:58 -04:00
commit 898bd53e6a
69 changed files with 13 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/usb.c
View File

@ -999,6 +999,17 @@ static int usb_setup_descriptor(struct usb_device *dev, bool do_read)
err = get_descriptor_len(dev, 64, 8);
if (err)
return err;
/*
* Logitech Unifying Receiver 046d:c52b bcdDevice 12.10 seems
* sensitive about the first Get Descriptor request. If there
* are any other requests in the same microframe, the device
* reports bogus data, first of the descriptor parts is not
* sent to the host. Wait over one microframe duration here
* (1mS for USB 1.x , 125uS for USB 2.0) to avoid triggering
* the issue.
*/
mdelay(1);
}
dev->epmaxpacketin[0] = dev->descriptor.bMaxPacketSize0;

1
common/usb_storage.c
View File

@ -239,6 +239,7 @@ static int usb_stor_probe_device(struct usb_device *udev)
ret = device_unbind(dev);
if (ret)
return ret;
continue;
}
ret = blk_probe_or_unbind(dev);

1
configs/arbel_evb_defconfig
View File

@ -60,6 +60,5 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
CONFIG_USB_STORAGE=y
# CONFIG_EFI_LOADER is not set

1
configs/at91sam9260ek_dataflash_cs0_defconfig
View File

@ -64,5 +64,4 @@ CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9260"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y

1
configs/at91sam9260ek_dataflash_cs1_defconfig
View File

@ -64,5 +64,4 @@ CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9260"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y

1
configs/at91sam9260ek_nandflash_defconfig
View File

@ -62,5 +62,4 @@ CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9260"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y

1
configs/at91sam9261ek_dataflash_cs0_defconfig
View File

@ -65,6 +65,5 @@ CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9261"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y
CONFIG_ATMEL_LCD_BGR555=y

1
configs/at91sam9261ek_dataflash_cs3_defconfig
View File

@ -65,6 +65,5 @@ CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9261"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y
CONFIG_ATMEL_LCD_BGR555=y

1
configs/at91sam9261ek_nandflash_defconfig
View File

@ -63,6 +63,5 @@ CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9261"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y
CONFIG_ATMEL_LCD_BGR555=y

1
configs/at91sam9263ek_dataflash_cs0_defconfig
View File

@ -67,6 +67,5 @@ CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9263"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y
CONFIG_ATMEL_LCD_BGR555=y

1
configs/at91sam9263ek_dataflash_defconfig
View File

@ -67,6 +67,5 @@ CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9263"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y
CONFIG_ATMEL_LCD_BGR555=y

1
configs/at91sam9263ek_nandflash_defconfig
View File

@ -65,6 +65,5 @@ CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9263"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y
CONFIG_ATMEL_LCD_BGR555=y

1
configs/at91sam9263ek_norflash_boot_defconfig
View File

@ -68,6 +68,5 @@ CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9263"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y
CONFIG_ATMEL_LCD_BGR555=y

1
configs/at91sam9263ek_norflash_defconfig
View File

@ -69,6 +69,5 @@ CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9263"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y
CONFIG_ATMEL_LCD_BGR555=y

1
configs/at91sam9g10ek_dataflash_cs0_defconfig
View File

@ -62,5 +62,4 @@ CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9261"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y

1
configs/at91sam9g10ek_dataflash_cs3_defconfig
View File

@ -62,5 +62,4 @@ CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9261"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y

1
configs/at91sam9g10ek_nandflash_defconfig
View File

@ -60,5 +60,4 @@ CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9261"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y

1
configs/at91sam9g20ek_2mmc_defconfig
View File

@ -65,5 +65,4 @@ CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9260"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y

1
configs/at91sam9g20ek_2mmc_nandflash_defconfig
View File

@ -64,5 +64,4 @@ CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9260"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y

1
configs/at91sam9g20ek_dataflash_cs0_defconfig
View File

@ -64,5 +64,4 @@ CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9260"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y

1
configs/at91sam9g20ek_dataflash_cs1_defconfig
View File

@ -64,5 +64,4 @@ CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9260"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y

1
configs/at91sam9g20ek_nandflash_defconfig
View File

@ -62,5 +62,4 @@ CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9260"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y

1
configs/at91sam9xeek_dataflash_cs0_defconfig
View File

@ -64,5 +64,4 @@ CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9260"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y

1
configs/at91sam9xeek_dataflash_cs1_defconfig
View File

@ -64,5 +64,4 @@ CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9260"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y

1
configs/at91sam9xeek_nandflash_defconfig
View File

@ -62,5 +62,4 @@ CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9260"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y

1
configs/axs103_defconfig
View File

@ -62,6 +62,5 @@ CONFIG_DESIGNWARE_SPI=y
CONFIG_USB=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
CONFIG_USB_STORAGE=y
CONFIG_USE_PRIVATE_LIBGCC=y

1
configs/chromebook_bob_defconfig
View File

@ -101,7 +101,6 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_DWC3=y
CONFIG_USB_KEYBOARD=y
CONFIG_USB_HOST_ETHER=y

1
configs/chromebook_kevin_defconfig
View File

@ -102,7 +102,6 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_DWC3=y
CONFIG_USB_KEYBOARD=y
CONFIG_USB_HOST_ETHER=y

1
configs/comtrend_ar5315u_ram_defconfig
View File

@ -72,5 +72,4 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_SYS_OHCI_SWAP_REG_ACCESS=y

1
configs/comtrend_ar5387un_ram_defconfig
View File

@ -73,5 +73,4 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_SYS_OHCI_SWAP_REG_ACCESS=y

1
configs/comtrend_ct5361_ram_defconfig
View File

@ -68,6 +68,5 @@ CONFIG_BCM6345_SERIAL=y
CONFIG_USB=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_SYS_OHCI_SWAP_REG_ACCESS=y
CONFIG_WDT_BCM6345=y

1
configs/comtrend_vr3032u_ram_defconfig
View File

@ -72,5 +72,4 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_SYS_OHCI_SWAP_REG_ACCESS=y

1
configs/comtrend_wap5813n_ram_defconfig
View File

@ -70,5 +70,4 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_SYS_OHCI_SWAP_REG_ACCESS=y

1
configs/da850evm_defconfig
View File

@ -108,7 +108,6 @@ CONFIG_USB=y
# CONFIG_SPL_DM_USB is not set
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_DA8XX=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=15
CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_DA8XX=y
CONFIG_USB_MUSB_PIO_ONLY=y

1
configs/da850evm_direct_nor_defconfig
View File

@ -87,7 +87,6 @@ CONFIG_DAVINCI_SPI=y
CONFIG_USB=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_DA8XX=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=15
CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_DA8XX=y
CONFIG_USB_MUSB_PIO_ONLY=y

1
configs/da850evm_nand_defconfig
View File

@ -111,7 +111,6 @@ CONFIG_USB=y
# CONFIG_SPL_DM_USB is not set
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_DA8XX=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=15
CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_DA8XX=y
CONFIG_USB_MUSB_PIO_ONLY=y

1
configs/devkit3250_defconfig
View File

@ -88,6 +88,5 @@ CONFIG_SYS_NS16550=y
CONFIG_SPI=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="lpc32xx-ohci"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
CONFIG_USB_OHCI_LPC32XX=y
CONFIG_OF_LIBFDT=y

1
configs/elgin-rv1108_defconfig
View File

@ -54,7 +54,6 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
CONFIG_USB_DWC2=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_PRODUCT_NUM=0x110a

1
configs/evb-rk3128_defconfig
View File

@ -52,7 +52,6 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
CONFIG_USB_DWC2=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DWC2_OTG=y

1
configs/evb-rk3328_defconfig
View File

@ -97,7 +97,6 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
CONFIG_USB_DWC2=y
CONFIG_USB_DWC3=y
# CONFIG_USB_DWC3_GADGET is not set

1
configs/evb-rv1108_defconfig
View File

@ -48,7 +48,6 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
CONFIG_USB_DWC2=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_PRODUCT_NUM=0x110a

1
configs/hsdk_4xd_defconfig
View File

@ -68,7 +68,6 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
CONFIG_USB_STORAGE=y
CONFIG_USE_PRIVATE_LIBGCC=y
CONFIG_PANIC_HANG=y

1
configs/hsdk_defconfig
View File

@ -67,7 +67,6 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
CONFIG_USB_STORAGE=y
CONFIG_USE_PRIVATE_LIBGCC=y
CONFIG_PANIC_HANG=y

1
configs/huawei_hg556a_ram_defconfig
View File

@ -70,5 +70,4 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_SYS_OHCI_SWAP_REG_ACCESS=y

1
configs/khadas-edge-captain-rk3399_defconfig
View File

@ -64,7 +64,6 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_ASIX88179=y

1
configs/khadas-edge-rk3399_defconfig
View File

@ -63,7 +63,6 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_ASIX88179=y

1
configs/khadas-edge-v-rk3399_defconfig
View File

@ -64,7 +64,6 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_ASIX88179=y

1
configs/nanopi-r2s-rk3328_defconfig
View File

@ -101,7 +101,6 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
CONFIG_USB_DWC2=y
CONFIG_USB_DWC3=y
# CONFIG_USB_DWC3_GADGET is not set

1
configs/netgear_dgnd3700v2_ram_defconfig
View File

@ -68,5 +68,4 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_SYS_OHCI_SWAP_REG_ACCESS=y

1
configs/omapl138_lcdk_defconfig
View File

@ -103,7 +103,6 @@ CONFIG_USB=y
# CONFIG_SPL_DM_USB is not set
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_DA8XX=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=15
CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_DA8XX=y
CONFIG_USB_MUSB_PIO_ONLY=y

1
configs/pinebook-pro-rk3399_defconfig
View File

@ -89,7 +89,6 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_DWC3=y
CONFIG_USB_DWC3_GENERIC=y
CONFIG_USB_KEYBOARD=y

1
configs/pm9261_defconfig
View File

@ -61,7 +61,6 @@ CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9261"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_BPP32 is not set

1
configs/pm9263_defconfig
View File

@ -64,7 +64,6 @@ CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9263"
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_BPP32 is not set

1
configs/roc-cc-rk3328_defconfig
View File

@ -106,7 +106,6 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
CONFIG_USB_DWC2=y
CONFIG_USB_DWC3=y
# CONFIG_USB_DWC3_GADGET is not set

1
configs/rock-pi-e-rk3328_defconfig
View File

@ -107,7 +107,6 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
CONFIG_USB_DWC2=y
CONFIG_USB_DWC3=y
# CONFIG_USB_DWC3_GADGET is not set

1
configs/rock64-rk3328_defconfig
View File

@ -104,7 +104,6 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
CONFIG_USB_DWC2=y
CONFIG_USB_DWC3=y
# CONFIG_USB_DWC3_GADGET is not set

1
configs/rock960-rk3399_defconfig
View File

@ -73,7 +73,6 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_DWC3=y
CONFIG_USB_KEYBOARD=y
CONFIG_USB_HOST_ETHER=y

1
configs/rockpro64-rk3399_defconfig
View File

@ -88,7 +88,6 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_DWC3=y
CONFIG_USB_DWC3_GENERIC=y
CONFIG_USB_KEYBOARD=y

1
configs/sama5d3_xplained_mmc_defconfig
View File

@ -102,7 +102,6 @@ CONFIG_ATMEL_PIT_TIMER=y
CONFIG_SPL_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y
CONFIG_USB_ATMEL_CLK_SEL_UPLL=y
CONFIG_USB_STORAGE=y

1
configs/sama5d3_xplained_nandflash_defconfig
View File

@ -105,7 +105,6 @@ CONFIG_ATMEL_PIT_TIMER=y
CONFIG_SPL_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y
CONFIG_USB_ATMEL_CLK_SEL_UPLL=y
CONFIG_USB_STORAGE=y

1
configs/sfr_nb4-ser_ram_defconfig
View File

@ -72,5 +72,4 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_SYS_OHCI_SWAP_REG_ACCESS=y

1
configs/smartweb_defconfig
View File

@ -92,7 +92,6 @@ CONFIG_MACB=y
CONFIG_RMII=y
CONFIG_ATMEL_USART=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"

1
configs/socrates_defconfig
View File

@ -98,6 +98,5 @@ CONFIG_USB=y
# CONFIG_USB_EHCI_HCD is not set
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_PCI=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=15
CONFIG_SYS_OHCI_SWAP_REG_ACCESS=y
CONFIG_USB_STORAGE=y

1
configs/stih410-b2260_defconfig
View File

@ -58,7 +58,6 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_GENERIC=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_DWC3=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y

1
configs/taurus_defconfig
View File

@ -110,7 +110,6 @@ CONFIG_SPECIFY_CONSOLE_INDEX=y
CONFIG_ATMEL_USART=y
CONFIG_USB=y
# CONFIG_SPL_DM_USB is not set
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
CONFIG_USB_ATMEL=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"

1
configs/vexpress_aemv8a_juno_defconfig
View File

@ -36,4 +36,3 @@ CONFIG_SYS_FLASH_CFI=y
CONFIG_SYS_MAX_FLASH_SECT=259
CONFIG_PCI=y
CONFIG_USB=y
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1

4
doc/README.generic_usb_ohci
View File

@ -16,10 +16,6 @@ Configuration options
CONFIG_SYS_USB_OHCI_SLOT_NAME: slot name
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS: maximal number of ports of the
root hub.
Endianness issues
------------------

5
drivers/usb/host/Kconfig
View File

@ -365,11 +365,6 @@ config SYS_USB_OHCI_SLOT_NAME
string "Display name for the OHCI controller"
depends on USB_OHCI_NEW && !DM_USB
config SYS_USB_OHCI_MAX_ROOT_PORTS
int "Maximal number of ports of the root hub"
depends on USB_OHCI_NEW
default 1 if ARCH_SUNXI
config SYS_OHCI_SWAP_REG_ACCESS
bool "Perform byte swapping on OHCI controller register accesses"
depends on USB_OHCI_NEW

10
drivers/usb/host/ohci.h
View File

@ -146,14 +146,6 @@ struct ohci_hcca {
u8 reserved_for_hc[116];
} __attribute__((aligned(256)));
/*
* Maximum number of root hub ports.
*/
#ifndef CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
#endif
/*
* This is the structure of the OHCI controller's memory mapped I/O
* region. This is Memory Mapped I/O. You must use the ohci_readl() and
@ -186,7 +178,7 @@ struct ohci_regs {
__u32 a;
__u32 b;
__u32 status;
__u32 portstatus[CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS];
__u32 portstatus[];
} roothub;
} __attribute__((aligned(32)));