usb: ohci: Use a flexible array member for portstatus
PATCH 1/1 usb: ohci: Use a flexible array member for portstatus
The struct is only used to overlay the MMIO region, so the behavior is the same. This obsoletes the Kconfig option for the number of ports.
Signed-off-by Samuel Holland <[email protected]>
---
configs/arbel_evb_defconfig | 1 - configs/at91sam9260ek_dataflash_cs0_defconfig | 1 - configs/at91sam9260ek_dataflash_cs1_defconfig | 1 - configs/at91sam9260ek_nandflash_defconfig | 1 - configs/at91sam9261ek_dataflash_cs0_defconfig | 1 - configs/at91sam9261ek_dataflash_cs3_defconfig | 1 - configs/at91sam9261ek_nandflash_defconfig | 1 - configs/at91sam9263ek_dataflash_cs0_defconfig | 1 - configs/at91sam9263ek_dataflash_defconfig | 1 - configs/at91sam9263ek_nandflash_defconfig | 1 - configs/at91sam9263ek_norflash_boot_defconfig | 1 - configs/at91sam9263ek_norflash_defconfig | 1 - configs/at91sam9g10ek_dataflash_cs0_defconfig | 1 - configs/at91sam9g10ek_dataflash_cs3_defconfig | 1 - configs/at91sam9g10ek_nandflash_defconfig | 1 - configs/at91sam9g20ek_2mmc_defconfig | 1 - configs/at91sam9g20ek_2mmc_nandflash_defconfig | 1 - configs/at91sam9g20ek_dataflash_cs0_defconfig | 1 - configs/at91sam9g20ek_dataflash_cs1_defconfig | 1 - configs/at91sam9g20ek_nandflash_defconfig | 1 - configs/at91sam9xeek_dataflash_cs0_defconfig | 1 - configs/at91sam9xeek_dataflash_cs1_defconfig | 1 - configs/at91sam9xeek_nandflash_defconfig | 1 - configs/axs103_defconfig | 1 - configs/chromebook_bob_defconfig | 1 - configs/chromebook_kevin_defconfig | 1 - configs/comtrend_ar5315u_ram_defconfig | 1 - configs/comtrend_ar5387un_ram_defconfig | 1 - configs/comtrend_ct5361_ram_defconfig | 1 - configs/comtrend_vr3032u_ram_defconfig | 1 - configs/comtrend_wap5813n_ram_defconfig | 1 - configs/da850evm_defconfig | 1 - configs/da850evm_direct_nor_defconfig | 1 - configs/da850evm_nand_defconfig | 1 - configs/devkit3250_defconfig | 1 - configs/elgin-rv1108_defconfig | 1 - configs/evb-rk3128_defconfig | 1 - configs/evb-rk3328_defconfig | 1 - configs/evb-rv1108_defconfig | 1 - configs/hsdk_4xd_defconfig | 1 - configs/hsdk_defconfig | 1 - configs/huawei_hg556a_ram_defconfig | 1 - configs/khadas-edge-captain-rk3399_defconfig | 1 - configs/khadas-edge-rk3399_defconfig | 1 - configs/khadas-edge-v-rk3399_defconfig | 1 - configs/nanopi-r2s-rk3328_defconfig | 1 - configs/netgear_dgnd3700v2_ram_defconfig | 1 - configs/omapl138_lcdk_defconfig | 1 - configs/pinebook-pro-rk3399_defconfig | 1 - configs/pm9261_defconfig | 1 - configs/pm9263_defconfig | 1 - configs/roc-cc-rk3328_defconfig | 1 - configs/rock-pi-e-rk3328_defconfig | 1 - configs/rock64-rk3328_defconfig | 1 - configs/rock960-rk3399_defconfig | 1 - configs/rockpro64-rk3399_defconfig | 1 - configs/sama5d3_xplained_mmc_defconfig | 1 - configs/sama5d3_xplained_nandflash_defconfig | 1 - configs/sfr_nb4-ser_ram_defconfig | 1 - configs/smartweb_defconfig | 1 - configs/socrates_defconfig | 1 - configs/stih410-b2260_defconfig | 1 - configs/taurus_defconfig | 1 - configs/vexpress_aemv8a_juno_defconfig | 1 - doc/README.generic_usb_ohci | 4 ---- drivers/usb/host/Kconfig | 5 ----- drivers/usb/host/ohci.h | 10 +--------- 67 files changed, 1 insertion(+), 82 deletions(-)
configs/arbel_evb_defconfig +0 -1
@@ -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
configs/at91sam9260ek_dataflash_cs0_defconfig +0 -1
@@ -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
configs/at91sam9260ek_dataflash_cs1_defconfig +0 -1
@@ -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
configs/at91sam9260ek_nandflash_defconfig +0 -1
@@ -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
configs/at91sam9261ek_dataflash_cs0_defconfig +0 -1
@@ -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
configs/at91sam9261ek_dataflash_cs3_defconfig +0 -1
@@ -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
configs/at91sam9261ek_nandflash_defconfig +0 -1
@@ -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
configs/at91sam9263ek_dataflash_cs0_defconfig +0 -1
@@ -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
configs/at91sam9263ek_dataflash_defconfig +0 -1
@@ -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
configs/at91sam9263ek_nandflash_defconfig +0 -1
@@ -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
configs/at91sam9263ek_norflash_boot_defconfig +0 -1
@@ -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
configs/at91sam9263ek_norflash_defconfig +0 -1
@@ -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
configs/at91sam9g10ek_dataflash_cs0_defconfig +0 -1
@@ -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
configs/at91sam9g10ek_dataflash_cs3_defconfig +0 -1
@@ -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
configs/at91sam9g10ek_nandflash_defconfig +0 -1
@@ -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
configs/at91sam9g20ek_2mmc_defconfig +0 -1
@@ -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
configs/at91sam9g20ek_2mmc_nandflash_defconfig +0 -1
@@ -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
configs/at91sam9g20ek_dataflash_cs0_defconfig +0 -1
@@ -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
configs/at91sam9g20ek_dataflash_cs1_defconfig +0 -1
@@ -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
configs/at91sam9g20ek_nandflash_defconfig +0 -1
@@ -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
configs/at91sam9xeek_dataflash_cs0_defconfig +0 -1
@@ -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
configs/at91sam9xeek_dataflash_cs1_defconfig +0 -1
@@ -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
configs/at91sam9xeek_nandflash_defconfig +0 -1
@@ -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
configs/axs103_defconfig +0 -1
@@ -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
configs/chromebook_bob_defconfig +0 -1
@@ -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
configs/chromebook_kevin_defconfig +0 -1
@@ -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
configs/comtrend_ar5315u_ram_defconfig +0 -1
@@ -71,5 +71,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
configs/comtrend_ar5387un_ram_defconfig +0 -1
@@ -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
configs/comtrend_ct5361_ram_defconfig +0 -1
@@ -67,6 +67,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
configs/comtrend_vr3032u_ram_defconfig +0 -1
@@ -71,5 +71,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
configs/comtrend_wap5813n_ram_defconfig +0 -1
@@ -69,5 +69,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
configs/da850evm_defconfig +0 -1
@@ -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
configs/da850evm_direct_nor_defconfig +0 -1
@@ -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
configs/da850evm_nand_defconfig +0 -1
@@ -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
configs/devkit3250_defconfig +0 -1
@@ -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
configs/elgin-rv1108_defconfig +0 -1
@@ -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
configs/evb-rk3128_defconfig +0 -1
@@ -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
configs/evb-rk3328_defconfig +0 -1
@@ -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
configs/evb-rv1108_defconfig +0 -1
@@ -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
configs/hsdk_4xd_defconfig +0 -1
@@ -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
configs/hsdk_defconfig +0 -1
@@ -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
configs/huawei_hg556a_ram_defconfig +0 -1
@@ -69,5 +69,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
configs/khadas-edge-captain-rk3399_defconfig +0 -1
@@ -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
configs/khadas-edge-rk3399_defconfig +0 -1
@@ -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
configs/khadas-edge-v-rk3399_defconfig +0 -1
@@ -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
configs/nanopi-r2s-rk3328_defconfig +0 -1
@@ -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
configs/netgear_dgnd3700v2_ram_defconfig +0 -1
@@ -67,5 +67,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
configs/omapl138_lcdk_defconfig +0 -1
@@ -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
configs/pinebook-pro-rk3399_defconfig +0 -1
@@ -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
configs/pm9261_defconfig +0 -1
@@ -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_DM_VIDEO=y # CONFIG_VIDEO_BPP32 is not set
configs/pm9263_defconfig +0 -1
@@ -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_DM_VIDEO=y # CONFIG_VIDEO_BPP32 is not set
configs/roc-cc-rk3328_defconfig +0 -1
@@ -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
configs/rock-pi-e-rk3328_defconfig +0 -1
@@ -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
configs/rock64-rk3328_defconfig +0 -1
@@ -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
configs/rock960-rk3399_defconfig +0 -1
@@ -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
configs/rockpro64-rk3399_defconfig +0 -1
@@ -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
configs/sama5d3_xplained_mmc_defconfig +0 -1
@@ -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
configs/sama5d3_xplained_nandflash_defconfig +0 -1
@@ -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
configs/sfr_nb4-ser_ram_defconfig +0 -1
@@ -71,5 +71,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
configs/smartweb_defconfig +0 -1
@@ -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"
configs/socrates_defconfig +0 -1
@@ -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
configs/stih410-b2260_defconfig +0 -1
@@ -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
configs/taurus_defconfig +0 -1
@@ -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"
configs/vexpress_aemv8a_juno_defconfig +0 -1
@@ -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
doc/README.generic_usb_ohci +0 -4
@@ -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 ------------------
drivers/usb/host/Kconfig +0 -5
@@ -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
drivers/usb/host/ohci.h +1 -9
@@ -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)));
Signature · 1 line
2.37.3
Marek Vasut
AppliedQuoted 66 lines · Samuel Holland
The struct is only used to overlay the MMIO region, so the behavior is the same. This obsoletes the
Kconfigoption for the number of ports.Signed-off-by Samuel Holland <[email protected]>---
configs/arbel_evb_defconfig | 1 - configs/at91sam9260ek_dataflash_cs0_defconfig | 1 - configs/at91sam9260ek_dataflash_cs1_defconfig | 1 - configs/at91sam9260ek_nandflash_defconfig | 1 - configs/at91sam9261ek_dataflash_cs0_defconfig | 1 - configs/at91sam9261ek_dataflash_cs3_defconfig | 1 - configs/at91sam9261ek_nandflash_defconfig | 1 - configs/at91sam9263ek_dataflash_cs0_defconfig | 1 - configs/at91sam9263ek_dataflash_defconfig | 1 - configs/at91sam9263ek_nandflash_defconfig | 1 - configs/at91sam9263ek_norflash_boot_defconfig | 1 - configs/at91sam9263ek_norflash_defconfig | 1 - configs/at91sam9g10ek_dataflash_cs0_defconfig | 1 - configs/at91sam9g10ek_dataflash_cs3_defconfig | 1 - configs/at91sam9g10ek_nandflash_defconfig | 1 - configs/at91sam9g20ek_2mmc_defconfig | 1 - configs/at91sam9g20ek_2mmc_nandflash_defconfig | 1 - configs/at91sam9g20ek_dataflash_cs0_defconfig | 1 - configs/at91sam9g20ek_dataflash_cs1_defconfig | 1 - configs/at91sam9g20ek_nandflash_defconfig | 1 - configs/at91sam9xeek_dataflash_cs0_defconfig | 1 - configs/at91sam9xeek_dataflash_cs1_defconfig | 1 - configs/at91sam9xeek_nandflash_defconfig | 1 - configs/axs103_defconfig | 1 - configs/chromebook_bob_defconfig | 1 - configs/chromebook_kevin_defconfig | 1 - configs/comtrend_ar5315u_ram_defconfig | 1 - configs/comtrend_ar5387un_ram_defconfig | 1 - configs/comtrend_ct5361_ram_defconfig | 1 - configs/comtrend_vr3032u_ram_defconfig | 1 - configs/comtrend_wap5813n_ram_defconfig | 1 - configs/da850evm_defconfig | 1 - configs/da850evm_direct_nor_defconfig | 1 - configs/da850evm_nand_defconfig | 1 - configs/devkit3250_defconfig | 1 - configs/elgin-rv1108_defconfig | 1 - configs/evb-rk3128_defconfig | 1 - configs/evb-rk3328_defconfig | 1 - configs/evb-rv1108_defconfig | 1 - configs/hsdk_4xd_defconfig | 1 - configs/hsdk_defconfig | 1 - configs/huawei_hg556a_ram_defconfig | 1 - configs/khadas-edge-captain-rk3399_defconfig | 1 - configs/khadas-edge-rk3399_defconfig | 1 - configs/khadas-edge-v-rk3399_defconfig | 1 - configs/nanopi-r2s-rk3328_defconfig | 1 - configs/netgear_dgnd3700v2_ram_defconfig | 1 - configs/omapl138_lcdk_defconfig | 1 - configs/pinebook-pro-rk3399_defconfig | 1 - configs/pm9261_defconfig | 1 - configs/pm9263_defconfig | 1 - configs/roc-cc-rk3328_defconfig | 1 - configs/rock-pi-e-rk3328_defconfig | 1 - configs/rock64-rk3328_defconfig | 1 - configs/rock960-rk3399_defconfig | 1 - configs/rockpro64-rk3399_defconfig | 1 - configs/sama5d3_xplained_mmc_defconfig | 1 - configs/sama5d3_xplained_nandflash_defconfig | 1 - configs/sfr_nb4-ser_ram_defconfig | 1 - configs/smartweb_defconfig | 1 -
Quoted 8 lines
configs/socrates_defconfig | 1 - configs/stih410-b2260_defconfig | 1 - configs/taurus_defconfig | 1 - configs/vexpress_aemv8a_juno_defconfig | 1 - doc/README.generic_usb_ohci | 4 ---- drivers/usb/host/Kconfig | 5 ----- drivers/usb/host/ohci.h | 10 +--------- 67 files changed, 1 insertion(+), 82 deletions(-)
Applied, thanks.