zephyrproject-rtos · maass-hamburg · Mar 8, 2026 · Mar 7, 2026 · Apr 9, 2026 · Apr 27, 2026
diff --git a/boards/nxp/frdm_k22f/frdm_k22f.yaml b/boards/nxp/frdm_k22f/frdm_k22f.yaml
@@ -19,5 +19,7 @@ supported:
   - pwm
   - spi
   - usb_device
+  - usbd
+  - usbh
   - watchdog
 vendor: nxp
diff --git a/boards/nxp/lpcxpresso55s28/lpcxpresso55s28.yaml b/boards/nxp/lpcxpresso55s28/lpcxpresso55s28.yaml
@@ -24,6 +24,8 @@ supported:
   - i2c
   - spi
   - usb_device
+  - usbd
+  - usbh
   - watchdog
   - gint
 vendor: nxp
diff --git a/boards/nxp/lpcxpresso55s69/lpcxpresso55s69_lpc55s69_cpu0.yaml b/boards/nxp/lpcxpresso55s69/lpcxpresso55s69_lpc55s69_cpu0.yaml
@@ -27,6 +27,8 @@ supported:
   - spi
   - sdhc
   - usb_device
+  - usbd
+  - usbh
   - watchdog
   - rtc
   - gint

diff --git a/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.yaml b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.yaml
@@ -28,6 +28,7 @@ supported:
   - spi
   - usb_device
   - usbd
+  - usbh
   - watchdog
   - rtc
 vendor: nxp
diff --git a/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_qspi.yaml b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_qspi.yaml
@@ -28,6 +28,7 @@ supported:
   - spi
   - usb_device
   - usbd
+  - usbh
   - watchdog
   - rtc
 vendor: nxp
diff --git a/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_hyperflash.yaml b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_hyperflash.yaml
@@ -30,6 +30,7 @@ supported:
   - spi
   - usb_device
   - usbd
+  - usbh
   - watchdog
   - rtc
 vendor: nxp
diff --git a/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi.yaml b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi.yaml
@@ -32,6 +32,7 @@ supported:
   - spi
   - usb_device
   - usbd
+  - usbh
   - watchdog
   - rtc
 vendor: nxp
diff --git a/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_B.yaml b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_B.yaml
@@ -30,6 +30,7 @@ supported:
   - sdhc
   - spi
   - usbd
+  - usbh
   - watchdog
   - rtc
 vendor: nxp
diff --git a/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_C.yaml b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_C.yaml
@@ -31,6 +31,7 @@ supported:
   - sdhc
   - spi
   - usbd
+  - usbh
   - watchdog
   - rtc
 vendor: nxp
diff --git a/boards/nxp/rd_rw612_bga/rd_rw612_bga.yaml b/boards/nxp/rd_rw612_bga/rd_rw612_bga.yaml
@@ -28,7 +28,8 @@ supported:
   - pwm
   - spi
   - usb_device
-  - usb_host
+  - usbd
+  - usbh
   - watchdog
   - netif:eth
   - netif:openthread

diff --git a/boards/qemu/riscv32/board.cmake b/boards/qemu/riscv32/board.cmake
@@ -34,4 +34,6 @@ set(QEMU_FLAGS_${ARCH}
   -cpu ${qemu_riscv_cpu}
   )
 
+set(QEMU_PCI_OHCI_FLAGS addr=2.0)
+
 include(${ZEPHYR_BASE}/boards/common/qemu.board.cmake)
diff --git a/boards/qemu/riscv32/qemu_riscv32.dts b/boards/qemu/riscv32/qemu_riscv32.dts
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: Apache-2.0 */

 /dts-v1/;

@@ -15,3 +15,17 @@
 &uart0 {
 	status = "okay";
 };
+
+&pcie {
+	zephyr_uhc0: pcie@2,0 {
+		compatible = "generic-ohci";
+		reg = <0x1000 0 0 0 0>;
+		vendor-id = <0x106b>;
+		device-id = <0x003f>;
+		interrupts = <1>;
+		interrupt-parent = <&pcie>;
+		maximum-speed = "full-speed";
+		dma-coherent;
+		status = "okay";
+	};
+};
diff --git a/boards/qemu/riscv32/qemu_riscv32.yaml b/boards/qemu/riscv32/qemu_riscv32.yaml
@@ -8,6 +8,7 @@ toolchain:
   - zephyr
 supported:
   - netif
+  - usbh
 ram: 262144
 flash: 32768
 testing:

diff --git a/boards/qemu/riscv32/qemu_riscv32_qemu_virt_riscv32_smp.dts b/boards/qemu/riscv32/qemu_riscv32_qemu_virt_riscv32_smp.dts
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: Apache-2.0 */

 /dts-v1/;

@@ -15,3 +15,17 @@
 &uart0 {
 	status = "okay";
 };
+
+&pcie {
+	zephyr_uhc0: pcie@2,0 {
+		compatible = "generic-ohci";
+		reg = <0x1000 0 0 0 0>;
+		vendor-id = <0x106b>;
+		device-id = <0x003f>;
+		interrupts = <1>;
+		interrupt-parent = <&pcie>;
+		maximum-speed = "full-speed";
+		dma-coherent;
+		status = "okay";
+	};
+};
diff --git a/boards/qemu/riscv32/qemu_riscv32_qemu_virt_riscv32_smp.yaml b/boards/qemu/riscv32/qemu_riscv32_qemu_virt_riscv32_smp.yaml
@@ -9,6 +9,7 @@ toolchain:
 supported:
   - netif
   - smp
+  - usbh
 ram: 262144
 flash: 32768
 testing:

diff --git a/cmake/emu/qemu.cmake b/cmake/emu/qemu.cmake
@@ -419,6 +419,12 @@ else()
   add_custom_target(qemu_nvme_disk)
 endif()
 
+if(CONFIG_UHC_OHCI_PCI)
+  list(APPEND QEMU_EXTRA_FLAGS
+    -device pci-ohci,${QEMU_PCI_OHCI_FLAGS}
+  )
+endif()
+
 if(NOT QEMU_PIPE)
   set(QEMU_PIPE_COMMENT "\nTo exit from QEMU enter: 'CTRL+a, x'\n")
 endif()

diff --git a/drivers/usb/uhc/CMakeLists.txt b/drivers/usb/uhc/CMakeLists.txt
@@ -6,6 +6,7 @@ zephyr_library()
 
 zephyr_library_sources(uhc_common.c)
 zephyr_library_sources_ifdef(CONFIG_UHC_MAX3421E uhc_max3421e.c)
+zephyr_library_sources_ifdef(CONFIG_UHC_OHCI uhc_ohci.c)
 zephyr_library_sources_ifdef(CONFIG_UHC_VIRTUAL uhc_virtual.c)
 zephyr_library_sources_ifdef(CONFIG_UHC_NXP_EHCI uhc_mcux_common.c uhc_mcux_ehci.c)
 zephyr_library_sources_ifdef(CONFIG_UHC_NXP_KHCI uhc_mcux_common.c uhc_mcux_khci.c)

diff --git a/drivers/usb/uhc/Kconfig b/drivers/usb/uhc/Kconfig
@@ -44,6 +44,7 @@ module-str = uhc drv
 source "subsys/logging/Kconfig.template.log_config"
 
 source "drivers/usb/uhc/Kconfig.max3421e"
+source "drivers/usb/uhc/Kconfig.ohci"
 source "drivers/usb/uhc/Kconfig.virtual"
 source "drivers/usb/uhc/Kconfig.mcux"
 

diff --git a/drivers/usb/uhc/Kconfig.ohci b/drivers/usb/uhc/Kconfig.ohci
@@ -0,0 +1,44 @@
+# SPDX-FileCopyrightText: Copyright The Zephyr Project Contributors
+# SPDX-License-Identifier: Apache-2.0
+
+config UHC_OHCI
+	bool "Generic OHCI USB host controller driver"
+	default y
+	depends on DT_HAS_GENERIC_OHCI_ENABLED
+	depends on !64BIT
+	help
+	  Generic OHCI USB host controller driver for any OHCI
+	  controller (OpenHCI 1.0a compatible). Only supported on
+	  32 bit, as OHCI only uses 32 bit registers for addresses.
+
+if UHC_OHCI
+
+config UHC_OHCI_PCI
+	bool
+	default y
+	depends on $(dt_compat_on_bus,$(DT_COMPAT_GENERIC_OHCI),pcie)
+	select PCIE
+	select DYNAMIC_INTERRUPTS if !PCIE_CONTROLLER
+
+config UHC_OHCI_BULK_SLOTS
+	int "Number of concurrent bulk/interrupt transfer slots"
+	range 1 8
+	default 4
+	help
+	  Number of concurrently active bulk/interrupt transfer slots. One slot
+	  is always reserved for control transfers. Each additional slot allows
+	  one more bulk or interrupt endpoint to stay posted simultaneously
+	  (e.g. both IN and OUT for CDC-ECM data plus the interrupt notification
+	  endpoint). Memory cost is one ED plus UHC_OHCI_MAX_TDS transfer
+	  descriptors per slot.
+
+config UHC_OHCI_MAX_TDS
+	int "Maximum TDs per transfer slot"
+	range 4 128
+	default 64
+	help
+	  Maximum number of OHCI transfer descriptors per slot. The driver
+	  allocates one pool of this size for the control slot and for each
+	  bulk/interrupt slot (see UHC_OHCI_BULK_SLOTS).
+
+endif # UHC_OHCI
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,8 @@ supported: @@
       - spi
       - sdhc
       - usb_device
+      - usbd
+      - usbh
       - watchdog
       - rtc
       - gint
@@ Expand Down @@