From 5014b3886713ee9cdcdba4dcca1b34b15fcb117a Mon Sep 17 00:00:00 2001 From: Joshua Warren <816217+joshuaswarren@users.noreply.github.com> Date: Mon, 9 Nov 2026 20:09:28 -0600 Subject: [PATCH] arm64: dts: apple: t6050-j714c: Describe the left-front USB-C port Enable the ATC1 template of t6050-dieX.dtsi on the J714c and link it to the port's PD controller: usb-pd@a on nub-spmi-a0, an SN201202x at SPMI address 0xa. The J714cAP ADT names it hpm1, port-number 2, port-location "left-front", acio-parent acio1, with atc-phy1, usb-drd1 and dart-usb1. The board file no longer disables nub-spmi-a0, atc1_phy, atc1_phy_mbox, usb_drd1 and its two DARTs. The atcphy1 alias lets the boot loader fill the PHY tunables. The left-back port (ATC0, hpm0) is not described. The combo PHY binding and driver exclude port index 0, the debug port that carries the boot link, on purpose. The port's USB4/Thunderbolt router (acio1) and its DisplayPort routes are not described; the PHY runs in USB mode. The other ten T6050 board DTBs are byte-identical. --- arch/arm64/boot/dts/apple/t6050-j714c.dts | 93 +++++++++++++++++------ 1 file changed, 68 insertions(+), 25 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t6050-j714c.dts b/arch/arm64/boot/dts/apple/t6050-j714c.dts index bd4ea3fc0d288..2afe054d92c03 100644 --- a/arch/arm64/boot/dts/apple/t6050-j714c.dts +++ b/arch/arm64/boot/dts/apple/t6050-j714c.dts @@ -109,35 +109,11 @@ }; }; -/* ATC1, ATC3 and the PD controller buses nub-spmi-a0 and -a2: not yet described for this board */ -&nub_spmi_a0 { - status = "disabled"; -}; - +/* ATC3 and the PD controller bus nub-spmi-a2: not on this board's ports */ &nub_spmi_a2 { status = "disabled"; }; -&atc1_phy_mbox { - status = "disabled"; -}; - -&atc1_phy { - status = "disabled"; -}; - -&usb_drd1 { - status = "disabled"; -}; - -&usb_drd1_dart_0 { - status = "disabled"; -}; - -&usb_drd1_dart_1 { - status = "disabled"; -}; - &atc3_phy_mbox { status = "disabled"; }; @@ -278,6 +254,73 @@ #include "t6050-max-atc2.dtsi" +/* + * ==== The left-front USB-C port (ATC1) ==== + * + * ADT /arm-io/nub-spmi-a0/hpm1 (SN201202x, SPMI address 0xa, port-number 2, port-location + * "left-front", acio-parent acio1), with atc-phy1, usb-drd1 and dart-usb1. The PHY, the DWC3 and + * their DARTs and mailbox are the ATC1 template of t6050-dieX.dtsi; only the links to the PD + * controller are the board's. The port's USB4/Thunderbolt router (/arm-io/acio1) and its + * DisplayPort routes are not described yet; the PHY runs in USB mode. + * + * The left-back port (ATC0, hpm0) is the boot link's debug port. The combo PHY binding and + * driver exclude it on purpose (apple,port-index 0), so it is not described either. + */ +/ { + aliases { + atcphy1 = &atc1_phy; + }; +}; + +&atc1_phy { + port { + atc1_phy_ep: endpoint { + remote-endpoint = <&hpm1_ss>; + }; + }; +}; + +&usb_drd1 { + port { + usb_drd1_hs: endpoint { + remote-endpoint = <&hpm1_hs>; + }; + }; +}; + +&nub_spmi_a0 { + hpm1: usb-pd@a { + compatible = "apple,sn201202x"; + reg = <0xa SPMI_USID>; + + connector { + compatible = "usb-c-connector"; + label = "USB-C Left Front"; + power-role = "dual"; + data-role = "dual"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + hpm1_hs: endpoint { + remote-endpoint = <&usb_drd1_hs>; + }; + }; + + port@1 { + reg = <1>; + hpm1_ss: endpoint { + remote-endpoint = <&atc1_phy_ep>; + }; + }; + }; + }; + }; +}; + /* The host DROM from the J714cAP ADT (/arm-io/acio2 thunderbolt-drom); the boot loader replaces it */ &acio2_nhi { apple,thunderbolt-drom = [fd 02 00 00 00 00 00 00 00 90 19 c3 8c 00 5c 00