diff --git a/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb b/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb
index c2584e6587..eaf998a73a 100644
--- a/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb
@@ -8,9 +8,78 @@ chip soc/amd/sabrina
 		end
 		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
+			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" = ""Left 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" = ""Left 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" = ""User-Facing Camera""
+							register "type" = "UPC_TYPE_INTERNAL"
+							device ref usb2_port1 on end
+						end
+					end
+				end
 			end
-			device ref xhci_1 on
+			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, 1)"
+							device ref usb3_port2 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, 2)"
+							device ref usb3_port3 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, 1)"
+							device ref usb2_port2 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, 2)"
+							device ref usb2_port3 on end
+						end
+						chip drivers/usb/acpi
+							register "desc" = ""World-Facing Camera""
+							register "type" = "UPC_TYPE_INTERNAL"
+							device ref usb2_port4 on end
+						end
+					end
+				end
+			end
+		end
+		device ref gpp_bridge_c on  # Internal GPP Bridge 2 to Bus C
+			device ref xhci_2 on # USB 2.0 (USB2)
+				chip drivers/usb/acpi
+					register "type" = "UPC_TYPE_HUB"
+					device usb 0.0 alias xhci_2_root_hub on
+						chip drivers/usb/acpi
+							register "desc" = ""Bluetooth""
+							register "type" = "UPC_TYPE_INTERNAL"
+							register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_10)"
+							device usb 2.3 alias usb2_port5 on end
+						end
+					end
+				end
 			end
 		end
 	end # domain