Skip to contentSkip to conversation

usb: ohci: Use a flexible array member for portstatus

PATCH Applied Samuel Holland 2 participants 2 messages Oct 31, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

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.

---

 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
index 9dbe45ff6a..447b97ef4a 100644
@@ -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
index df4bebeeb5..437655f8a6 100644
@@ -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
index 41bfed5dec..6619c5365c 100644
@@ -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
index aa829b4661..0b0c354dc1 100644
@@ -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
index 2fc0b8751d..33abbd205f 100644
@@ -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
index 599b56024e..af02a78be8 100644
@@ -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
index a8ff0d2f81..0fa86aec91 100644
@@ -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
index 1fb3153cb1..2bfb92f4b6 100644
@@ -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
index 1fb3153cb1..2bfb92f4b6 100644
@@ -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
index 26f3932ddf..9fd2a7c3dc 100644
@@ -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
index b0a01c2c68..a5c2f0d64b 100644
@@ -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
index fbf40ef524..b00afe22b1 100644
@@ -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
index d9178cd496..c72f0de056 100644
@@ -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
index cca871f847..207941bd41 100644
@@ -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
index a85c01f941..c66bb068f9 100644
@@ -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
index fb4cb6db31..7e0bdce7bc 100644
@@ -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
index 67567c5db6..b58a644f4e 100644
@@ -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
index 4da431dcbc..6b6664c99d 100644
@@ -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
index d9281d6b09..c60726c5b7 100644
@@ -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
index ea0f171f54..194936203d 100644
@@ -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
index df4bebeeb5..437655f8a6 100644
@@ -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
index 41bfed5dec..6619c5365c 100644
@@ -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
index aa829b4661..0b0c354dc1 100644
@@ -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
index f486e375f1..268cc3f6b8 100644
@@ -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
index d81129a2d8..702f62634f 100644
@@ -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
index bafa9fb4de..c110a7d1fe 100644
@@ -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
index 013ce0a137..4a38849188 100644
@@ -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
index 052e0ac541..90696d698d 100644
@@ -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
index 608a888015..79a407069a 100644
@@ -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
index 7f6573b73f..a709b2f4e7 100644
@@ -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
index 09f62cb7d2..592803d369 100644
@@ -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
index d39801068d..8d3d0fa5ad 100644
@@ -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
index a9996d7850..8086532ffe 100644
@@ -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
index f3ae5a77cc..4ab1657d5b 100644
@@ -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
index 744ffbd943..a659c01850 100644
@@ -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
index adfc56c641..ffcb3bb9b6 100644
@@ -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
index 6526933274..f8158441a4 100644
@@ -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
index 2782a3901d..76426eb00a 100644
@@ -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
index fc0f052416..bac2ac379e 100644
@@ -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
index bcdae7d2e8..c3e9a3d148 100644
@@ -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
index 943cd69688..9f3ef6591a 100644
@@ -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
index 0788cf5c15..a6ce48275f 100644
@@ -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
index b0dabfaf43..6ca7fb3070 100644
@@ -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
index 93a9f0009d..f3feb6c120 100644
@@ -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
index bc540f4c78..e3eb4d85d9 100644
@@ -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
index 86f5e111f8..e851c11a88 100644
@@ -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
index cbe1d212af..c8ec064ddd 100644
@@ -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
index a7918aaa0b..1e914c46d2 100644
@@ -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
index 5d9a841899..aefb32a38c 100644
@@ -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
index 0e9cb5d036..1655b56021 100644
@@ -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
index 2a16c833ae..17438c4069 100644
@@ -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
index 8ba50345da..afff770762 100644
@@ -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
index fb5eac3c1f..53cb169a52 100644
@@ -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
index b055dd0979..9b327edd05 100644
@@ -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
index daa0d3ddf5..0800f56e6c 100644
@@ -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
index 87fe8c4046..1ee6944c5b 100644
@@ -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
index 834dcc1b82..f06900aaea 100644
@@ -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
index 93497500bd..31c5af2f56 100644
@@ -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
index f32e943705..ff99026247 100644
@@ -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
index 7201a6d208..ccb6adcaee 100644
@@ -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
index bb73f28b36..9d6963b533 100644
@@ -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
index ce3a0384f0..81d1d1c3ed 100644
@@ -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
index e95ee1b5c4..0b70fbd8b5 100644
@@ -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
index 893a906767..73b7363b68 100644
@@ -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
index a7da4bcb83..82fea6201d 100644
@@ -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
index 1aabe062fb..4efdd708c2 100644
@@ -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
index 7699f2e6b1..87ef19074b 100644
@@ -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
Applied
#1 lore raw
Quoted 66 lines · Samuel Holland

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.

---

  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.