diff --git a/src/mainboard/system76/darp7/devicetree.cb b/src/mainboard/system76/darp7/devicetree.cb
index 53a17af2a9..ca498248c0 100644
--- a/src/mainboard/system76/darp7/devicetree.cb
+++ b/src/mainboard/system76/darp7/devicetree.cb
@@ -151,7 +151,7 @@ chip soc/intel/tigerlake
 					chip drivers/usb/acpi
 						register "desc" = ""USB3 J_TYPEC2""
 						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
-						register "group" = "ACPI_PLD_GROUP(1, 1)"
+						register "group" = "ACPI_PLD_GROUP(1, 3)"
 						device ref tcss_usb3_port1 on end
 					end
 				end
@@ -185,19 +185,18 @@ chip soc/intel/tigerlake
 					chip drivers/usb/acpi
 						register "desc" = ""USB2 UJ_USB1""
 						register "type" = "UPC_TYPE_A"
-						register "group" = "ACPI_PLD_GROUP(1, 2)"
 						device ref usb2_port1 on end
 					end
 					chip drivers/usb/acpi
 						register "desc" = ""USB2 J_TYPEC1""
 						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
-						register "group" = "ACPI_PLD_GROUP(2, 1)"
+						register "group" = "ACPI_PLD_GROUP(1, 2)"
 						device ref usb2_port2 on end
 					end
 					chip drivers/usb/acpi
 						register "desc" = ""USB2 J_USB3_1""
 						register "type" = "UPC_TYPE_A"
-						register "group" = "ACPI_PLD_GROUP(2, 2)"
+						register "group" = "ACPI_PLD_GROUP(1, 1)"
 						device ref usb2_port3 on end
 					end
 					chip drivers/usb/acpi
@@ -208,7 +207,7 @@ chip soc/intel/tigerlake
 					chip drivers/usb/acpi
 						register "desc" = ""USB2 J_TYPEC2""
 						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
-						register "group" = "ACPI_PLD_GROUP(1, 1)"
+						register "group" = "ACPI_PLD_GROUP(1, 3)"
 						device ref usb2_port6 on end
 					end
 					chip drivers/usb/acpi
@@ -224,19 +223,19 @@ chip soc/intel/tigerlake
 					chip drivers/usb/acpi
 						register "desc" = ""USB3 J_TYPEC1 CH0""
 						register "type" = "UPC_TYPE_A"
-						register "group" = "ACPI_PLD_GROUP(2, 1)"
+						register "group" = "ACPI_PLD_GROUP(1, 2)"
 						device ref usb3_port2 on end
 					end
 					chip drivers/usb/acpi
 						register "desc" = ""USB3 J_USB3_1""
 						register "type" = "UPC_TYPE_A"
-						register "group" = "ACPI_PLD_GROUP(2, 2)"
+						register "group" = "ACPI_PLD_GROUP(1, 1)"
 						device ref usb3_port3 on end
 					end
 					chip drivers/usb/acpi
 						register "desc" = ""USB3 J_TYPEC1 CH1""
 						register "type" = "UPC_TYPE_A"
-						register "group" = "ACPI_PLD_GROUP(2, 1)"
+						register "group" = "ACPI_PLD_GROUP(1, 2)"
 						device ref usb3_port4 on end
 					end
 				end