diff --git a/src/mainboard/google/brya/variants/brya0/overridetree.cb b/src/mainboard/google/brya/variants/brya0/overridetree.cb
index 9584b277b1..eb0af9981d 100644
--- a/src/mainboard/google/brya/variants/brya0/overridetree.cb
+++ b/src/mainboard/google/brya/variants/brya0/overridetree.cb
@@ -165,17 +165,15 @@ chip soc/intel/alderlake
 		end
 		device ref tcss_dma0 on
 			chip drivers/intel/usb4/retimer
-				register "dfp" = "{
-					[0] = {.power_gpio = ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E4),
-					       .group = ACPI_PLD_GROUP(1, 1),}}"
+				register "dfp[0].power_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E4)"
+				use tcss_usb3_port1 as dfp[0].typec_port
 				device generic 0 on end
 			end
 		end
 		device ref tcss_dma1 on
 			chip drivers/intel/usb4/retimer
-				register "dfp" = "{
-					[0] = {.power_gpio = ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E4),
-					       .group = ACPI_PLD_GROUP(3, 1)}}"
+				register "dfp[0].power_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E4)"
+				use tcss_usb3_port3 as dfp[0].typec_port
 				device generic 0 on end
 			end
 		end
diff --git a/src/mainboard/google/brya/variants/primus/overridetree.cb b/src/mainboard/google/brya/variants/primus/overridetree.cb
index 36d015da6a..2d68c367c3 100644
--- a/src/mainboard/google/brya/variants/primus/overridetree.cb
+++ b/src/mainboard/google/brya/variants/primus/overridetree.cb
@@ -158,17 +158,15 @@ chip soc/intel/alderlake
 		end	#PCIE3 BH799BB
 		device ref tcss_dma0 on
 			chip drivers/intel/usb4/retimer
-				register "dfp" = "{
-					[0] = {.power_gpio = ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E4),
-					       .group = ACPI_PLD_GROUP(1, 1),}}"
+				register "dfp[0].power_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E4)"
+				use tcss_usb3_port1 as dfp[0].typec_port
 				device generic 0 on end
 			end
 		end
 		device ref tcss_dma1 on
 			chip drivers/intel/usb4/retimer
-				register "dfp" = "{
-					[0] = {.power_gpio = ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E4),
-					       .group = ACPI_PLD_GROUP(3, 1)}}"
+				register "dfp[0].power_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E4)"
+                                use tcss_usb3_port3 as dfp[0].typec_port
 				device generic 0 on end
 			end
 		end
diff --git a/src/mainboard/google/volteer/variants/voxel/overridetree.cb b/src/mainboard/google/volteer/variants/voxel/overridetree.cb
index b3619b2697..7eabfa4d4a 100644
--- a/src/mainboard/google/volteer/variants/voxel/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/voxel/overridetree.cb
@@ -220,11 +220,10 @@ chip soc/intel/tigerlake
 			probe DB_USB USB4_GEN2
 			probe DB_USB USB4_GEN3
 			chip drivers/intel/usb4/retimer
-				register "dfp" = "{
-					[0] = {.power_gpio = ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_H10),
-					       .group = ACPI_PLD_GROUP(3, 2),},
-					[1] = {.power_gpio = ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_H10),
-					       .group = ACPI_PLD_GROUP(2, 2),}}"
+				register "dfp[0].power_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_H10)"
+				register "dfp[1].power_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_H10)"
+				use tcss_usb3_port3 as dfp[0].typec_port
+				use tcss_usb3_port2 as dfp[1].typec_port
 				device generic 0 on end
 			end
 		end