diff --git a/device/testing/linux-postmarketos-qcom-sm8550/APKBUILD b/device/testing/linux-postmarketos-qcom-sm8550/APKBUILD
index 31bf1b36b..7de06a569 100644
--- a/device/testing/linux-postmarketos-qcom-sm8550/APKBUILD
+++ b/device/testing/linux-postmarketos-qcom-sm8550/APKBUILD
@@ -95,5 +95,5 @@ sha512sums="
 52d5aa7f94f6aa6141debf4ceb4fc7a2e75505a7cd38b8854e501be83c2b57863020f463f2fdb2fc93667e6cfe13274d077e5207a611e4797bd9404ee0e64c58  linux-postmarketos-qcom-sm8550-7.2.tar.gz
 f9ae52489f6b9e6fef64952943cd09732a5bef90a0e8765db03c256483028368687d6d5a1d80dd813a513e7e80d91f8b47f49b91cff67266b76f1d6275a7fea0  config-motorola-rtwo.aarch64
 fdcd938d44aef233aa0dcd7ac3f45b00df7f380d9e8504f9f18e1484d67d8eece74396be7b90eb608c20333a4dddfcfc317e69e9e33bb2c28767af4d1d55cee0  rtwo.config
-71270b409e4fc5b6f5ddd164629c937e5ad783761c8a290d46d36a3ba21a96702c1861bfc20e0a1225b2af6d88d21333b5a9c82149f125ed42385c9c7dd207cf  sm8550-motorola-rtwo.dts
+d3b10b54539c85eab2f200544710a63771518a1fb6aa9fed0d453a69f85de03c36d6da392e0671d6bbe0b79443169042779897b1c00c771a89a19d1540473693  sm8550-motorola-rtwo.dts
 "
diff --git a/device/testing/linux-postmarketos-qcom-sm8550/sm8550-motorola-rtwo.dts b/device/testing/linux-postmarketos-qcom-sm8550/sm8550-motorola-rtwo.dts
index 5a0006c0e..db66e7c31 100644
--- a/device/testing/linux-postmarketos-qcom-sm8550/sm8550-motorola-rtwo.dts
+++ b/device/testing/linux-postmarketos-qcom-sm8550/sm8550-motorola-rtwo.dts
@@ -542,13 +542,20 @@
 };
 
 &usb_1 {
-	status = "okay";
-};
-
-&usb_1_dwc3 {
-	/* peripheral-only is safest for bring-up (USB networking in initramfs) */
+	/*
+	 * High-speed peripheral only for bring-up (USB networking in the
+	 * initramfs). Drop the SuperSpeed PHY + the type-C role switch so dwc3
+	 * comes up without pmic-glink / a connector. Restore usb-role-switch,
+	 * the usb3-phy and &usb_dp_qmpphy once type-C is described.
+	 */
 	dr_mode = "peripheral";
 	maximum-speed = "high-speed";
+	/delete-property/ usb-role-switch;
+	/delete-property/ phys;
+	/delete-property/ phy-names;
+	phys = <&usb_1_hsphy>;
+	phy-names = "usb2-phy";
+	status = "okay";
 };
 
 &usb_1_hsphy {
@@ -558,12 +565,6 @@
 	status = "okay";
 };
 
-/*
- * The USB3/DP combo PHY is left disabled for now; high-speed gadget mode is
- * enough for the initramfs debug shell. Enable &usb_dp_qmpphy and drop
- * "maximum-speed" above once SuperSpeed / DisplayPort is needed.
- */
-
 &xo_board {
 	clock-frequency = <76800000>;
 };