diff options
| author | Tom Rini <[email protected]> | 2022-11-04 11:19:58 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-11-04 11:19:58 -0400 |
| commit | 898bd53e6a930080cee7cd7b1a09120c4dfd9467 (patch) | |
| tree | fd06828cca513d7ea09b522750afe4be071c2e61 /drivers | |
| parent | 45fc699cc54739c6f80ae4da920c121bc7d8665a (diff) | |
| parent | 04448899de702321c018d0c4be2f6cc1d2f06760 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-usb
- 3 important fixes
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/host/Kconfig | 5 | ||||
| -rw-r--r-- | drivers/usb/host/ohci.h | 10 |
2 files changed, 1 insertions, 14 deletions
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 1aabe062fb3..4efdd708c2e 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -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 diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h index 7699f2e6b15..87ef19074b0 100644 --- a/drivers/usb/host/ohci.h +++ b/drivers/usb/host/ohci.h @@ -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))); |