diff --git a/src/mainboard/google/guybrush/variants/baseboard/devicetree.cb b/src/mainboard/google/guybrush/variants/baseboard/devicetree.cb
index b688138d73..eeae88eee2 100644
--- a/src/mainboard/google/guybrush/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/guybrush/variants/baseboard/devicetree.cb
@@ -41,6 +41,81 @@ chip soc/amd/cezanne
 	device domain 0 on
 		device ref gpp_bridge_a on  # Internal GPP Bridge 0 to Bus A
 			device ref gfx on end # Internal GPU (GFX)
+			device ref xhci_0 on # USB 3.1 (USB0)
+				chip drivers/usb/acpi
+					device ref xhci_0_root_hub on
+						chip drivers/usb/acpi
+							register "desc" = ""Right Type-C Port""
+							register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
+							register "group" = "ACPI_PLD_GROUP(1, 1)"
+							device ref usb3_port0 on end
+						end
+						chip drivers/usb/acpi
+							register "desc" = ""Right Type-A Port""
+							register "type" = "UPC_TYPE_USB3_A"
+							register "group" = "ACPI_PLD_GROUP(1, 2)"
+							device ref usb3_port1 on end
+						end
+						chip drivers/usb/acpi
+							register "desc" = ""Right Type-C Port""
+							register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
+							register "group" = "ACPI_PLD_GROUP(1, 1)"
+							device ref usb2_port0 on end
+						end
+						chip drivers/usb/acpi
+							register "desc" = ""Right Type-A Port""
+							register "type" = "UPC_TYPE_USB3_A"
+							register "group" = "ACPI_PLD_GROUP(1, 2)"
+							device ref usb2_port1 on end
+						end
+						chip drivers/usb/acpi
+							register "desc" = ""User-Facing Camera""
+							register "type" = "UPC_TYPE_INTERNAL"
+							device ref usb2_port2 on end
+						end
+						chip drivers/usb/acpi
+							register "desc" = ""World-Facing Camera""
+							register "type" = "UPC_TYPE_INTERNAL"
+							device ref usb2_port3 on end
+						end
+					end
+				end
+			end
+			device ref xhci_1 on # USB 3.1 (USB1)
+				chip drivers/usb/acpi
+					device ref xhci_1_root_hub on
+						chip drivers/usb/acpi
+							register "desc" = ""Left Type-C Port""
+							register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
+							register "group" = "ACPI_PLD_GROUP(2, 2)"
+							device ref usb3_port4 on end
+						end
+						chip drivers/usb/acpi
+							register "desc" = ""Left Type-A Port""
+							register "type" = "UPC_TYPE_USB3_A"
+							register "group" = "ACPI_PLD_GROUP(2, 1)"
+							device ref usb3_port5 on end
+						end
+						chip drivers/usb/acpi
+							register "desc" = ""Left Type-C Port""
+							register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
+							register "group" = "ACPI_PLD_GROUP(2, 2)"
+							device ref usb2_port4 on end
+						end
+						chip drivers/usb/acpi
+							register "desc" = ""Left Type-A Port""
+							register "type" = "UPC_TYPE_USB3_A"
+							register "group" = "ACPI_PLD_GROUP(2, 1)"
+							device ref usb2_port5 on end
+						end
+						chip drivers/usb/acpi
+							register "desc" = ""Bluetooth""
+							register "type" = "UPC_TYPE_INTERNAL"
+							device ref usb2_port6 on end
+						end
+					end
+				end
+			end
 		end
 
 		device ref lpc_bridge on