diff --git a/src/soc/amd/cezanne/Kconfig b/src/soc/amd/cezanne/Kconfig
index 290fc229a6..01b38e06fb 100644
--- a/src/soc/amd/cezanne/Kconfig
+++ b/src/soc/amd/cezanne/Kconfig
@@ -15,6 +15,8 @@ config SOC_SPECIFIC_OPTIONS
 	select ARCH_ROMSTAGE_X86_32
 	select ARCH_RAMSTAGE_X86_32
 	select BOOT_DEVICE_SUPPORTS_WRITES if BOOT_DEVICE_SPI_FLASH
+	select DRIVERS_USB_ACPI
+	select DRIVERS_USB_PCI_XHCI
 	select FSP_COMPRESS_FSP_M_LZMA
 	select FSP_COMPRESS_FSP_S_LZMA
 	select HAVE_ACPI_TABLES
diff --git a/src/soc/amd/cezanne/chipset.cb b/src/soc/amd/cezanne/chipset.cb
index cb05750eb6..0963637408 100644
--- a/src/soc/amd/cezanne/chipset.cb
+++ b/src/soc/amd/cezanne/chipset.cb
@@ -25,8 +25,56 @@ chip soc/amd/cezanne
 			device pci 0.0 alias gfx off end # Internal GPU (GFX)
 			device pci 0.1 alias gfx_hda off end # Display HD Audio Controller (GFXAZ)
 			device pci 0.2 alias crypto off end # Crypto Coprocessor
-			device pci 0.3 alias xhci_0 off end
-			device pci 0.4 alias xhci_1 off end
+			device pci 0.3 alias xhci_0 off
+				chip drivers/usb/acpi
+					register "type" = "UPC_TYPE_HUB"
+					device usb 0.0 alias xhci_0_root_hub off
+						chip drivers/usb/acpi
+							device usb 3.0 alias usb3_port0 off end
+						end
+						chip drivers/usb/acpi
+							device usb 3.1 alias usb3_port1 off end
+						end
+						chip drivers/usb/acpi
+							device usb 2.0 alias usb2_port0 off end
+						end
+						chip drivers/usb/acpi
+							device usb 2.1 alias usb2_port1 off end
+						end
+						chip drivers/usb/acpi
+							device usb 2.2 alias usb2_port2 off end
+						end
+						chip drivers/usb/acpi
+							device usb 2.3 alias usb2_port3 off end
+						end
+					end
+				end
+			end
+			device pci 0.4 alias xhci_1 off
+				chip drivers/usb/acpi
+					register "type" = "UPC_TYPE_HUB"
+					device usb 0.0 alias xhci_1_root_hub off
+						chip drivers/usb/acpi
+							device usb 3.0 alias usb3_port4 off end
+						end
+						chip drivers/usb/acpi
+							device usb 3.1 alias usb3_port5 off end
+						end
+						chip drivers/usb/acpi
+							device usb 2.0 alias usb2_port4 off end
+						end
+						chip drivers/usb/acpi
+							device usb 2.1 alias usb2_port5 off end
+						end
+						chip drivers/usb/acpi
+							device usb 2.2 alias usb2_port6 off end
+						end
+						chip drivers/usb/acpi
+							device usb 2.3 alias usb2_port7 off end
+						end
+					end
+				end
+			end
 			device pci 0.5 alias acp off end # Audio Processor (ACP)
 			device pci 0.6 alias hda off end # Audio Processor HD Audio Controller (main AZ)
 			device pci 0.7 alias mp2 off end # Sensor Fusion Hub (MP2)