diff --git a/arch/arm64/boot/dts/apple/t6000-j314s.dts b/arch/arm64/boot/dts/apple/t6000-j314s.dts
index afa86668440f04..1e50b488bc4006 100644
--- a/arch/arm64/boot/dts/apple/t6000-j314s.dts
+++ b/arch/arm64/boot/dts/apple/t6000-j314s.dts
@@ -9,6 +9,8 @@
 
 /dts-v1/;
 
+#define ENABLE_DCPEXT_TYPEC
+
 #include "t6000.dtsi"
 #include "t600x-j314-j316.dtsi"
 
diff --git a/arch/arm64/boot/dts/apple/t6000-j316s.dts b/arch/arm64/boot/dts/apple/t6000-j316s.dts
index ddfc3c530923c7..96175af52bbf65 100644
--- a/arch/arm64/boot/dts/apple/t6000-j316s.dts
+++ b/arch/arm64/boot/dts/apple/t6000-j316s.dts
@@ -9,6 +9,8 @@
 
 /dts-v1/;
 
+#define ENABLE_DCPEXT_TYPEC
+
 #include "t6000.dtsi"
 #include "t600x-j314-j316.dtsi"
 
diff --git a/arch/arm64/boot/dts/apple/t6001-j314c.dts b/arch/arm64/boot/dts/apple/t6001-j314c.dts
index 245df6d03ee422..8e753d3ee676b7 100644
--- a/arch/arm64/boot/dts/apple/t6001-j314c.dts
+++ b/arch/arm64/boot/dts/apple/t6001-j314c.dts
@@ -9,6 +9,8 @@
 
 /dts-v1/;
 
+#define ENABLE_DCPEXT_TYPEC
+
 #include "t6001.dtsi"
 #include "t600x-j314-j316.dtsi"
 
diff --git a/arch/arm64/boot/dts/apple/t6001-j316c.dts b/arch/arm64/boot/dts/apple/t6001-j316c.dts
index a000d497b705fa..5782f93e496de6 100644
--- a/arch/arm64/boot/dts/apple/t6001-j316c.dts
+++ b/arch/arm64/boot/dts/apple/t6001-j316c.dts
@@ -9,6 +9,8 @@
 
 /dts-v1/;
 
+#define ENABLE_DCPEXT_TYPEC
+
 #include "t6001.dtsi"
 #include "t600x-j314-j316.dtsi"
 
diff --git a/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi b/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
index e8b58b8e8005d2..db2a56f40cd5fd 100644
--- a/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
+++ b/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
@@ -9,8 +9,6 @@
  * Copyright The Asahi Linux Contributors
  */
 
-#define ENABLE_DCPEXT_TYPEC
-
 #include <dt-bindings/leds/common.h>
 
 / {
@@ -191,11 +189,6 @@
 			power-role = "dual";
 			data-role = "dual";
 
-#ifdef ENABLE_DCPEXT_TYPEC
-			/* hacks */
-			displayport = <&dcpext1>;
-#endif
-
 			ports {
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -228,6 +221,11 @@
 			power-role = "dual";
 			data-role = "dual";
 
+#ifdef ENABLE_DCPEXT_TYPEC
+			/* hacks */
+			displayport = <&dcpext1>;
+#endif
+
 			ports {
 				#address-cells = <1>;
 				#size-cells = <0>;
@@ -280,10 +278,10 @@
 	apple,connector-type = "DP";
 
 	/* hacks */
-	apple,dptx-phy = <1>;
-	phys = <&atcphy1 PHY_TYPE_DP>;
+	apple,dptx-phy = <2>;
+	phys = <&atcphy2 PHY_TYPE_DP>;
 	phy-names = "dp-phy";
-	mux-controls = <&atcphy1_xbar 0>;
+	mux-controls = <&atcphy2_xbar 0>;
 	mux-control-names = "dp-xbar";
 	mux-index = <2>;
 };
@@ -292,11 +290,11 @@
 	status = "okay";
 };
 
-&atcphy1_xbar {
+&atcphy2_xbar {
         status = "okay";
 };
 
-&ps_atc1_common {
+&ps_atc2_common {
 	apple,always-on; /* Needs to stay on for DP-alt suspend/resume */
 };
 #endif
diff --git a/drivers/phy/apple/atc.c b/drivers/phy/apple/atc.c
index dc867f368b6874..a76ba21123ab8c 100644
--- a/drivers/phy/apple/atc.c
+++ b/drivers/phy/apple/atc.c
@@ -459,7 +459,7 @@ enum atcphy_lane_mode {
 #define PIPEHANDLER_DUMMY_PHY_EN BIT(15)
 #define PIPEHANDLER_NATIVE_POWER_DOWN GENMASK(3, 0)
 
-#define PIPEHANDLER_LOCK_ACK_TIMEOUT_US 1000
+#define PIPEHANDLER_LOCK_ACK_TIMEOUT_US 100000
 
 /* USB2 PHY regs */
 #define USB2PHY_USBCTL 0x00