Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 0 additions & 117 deletions arch/arm64/boot/dts/apple/t6040-j614s.dts
Original file line number Diff line number Diff line change
Expand Up @@ -98,121 +98,4 @@
status = "disabled";
};

/*
* USB4/Thunderbolt on all three Type-C ports: typec0 (left back, ACIO0),
* typec1 (left front, ACIO1) and typec2 (right, ACIO2), as on the J616s: the
* J614s ADT has the same acio0-2, dart-acio0-2 and acio-cpu0-2. The loader
* hands each router its router, adapter and NHI tuning and its DROM over. No
* PCIe tunnels yet: host-to-host (XDomain, thunderbolt-net) and USB4 links
* only.
*/
&pmgr_cio {
status = "okay";
};

&ps_atc0_cio {
status = "okay";
};

&ps_atc0_pcie {
status = "okay";
};

&ps_atc0_cio_pcie {
status = "okay";
};

&ps_atc0_cio_usb {
status = "okay";
};

&usb4_0_mbox {
status = "okay";
};

&usb4_0_acio {
/delete-property/ apple,pcie-tunnel;
status = "okay";
};

&usb4_0_dart {
/* ADT dart-acio0 vm-base: the NHI addresses its rings below 1 TiB + 4 GiB. */
apple,dma-range = <0x100 0x4000 0x0 0xffff0000>;
status = "okay";
};

&usb4_0_nhi {
status = "okay";
};

&ps_atc1_cio {
status = "okay";
};

&ps_atc1_pcie {
status = "okay";
};

&ps_atc1_cio_pcie {
status = "okay";
};

&ps_atc1_cio_usb {
status = "okay";
};

&usb4_1_mbox {
status = "okay";
};

&usb4_1_acio {
/delete-property/ apple,pcie-tunnel;
status = "okay";
};

&usb4_1_dart {
/* The same DVA window as the ACIO0 router DART. */
apple,dma-range = <0x100 0x4000 0x0 0xffff0000>;
status = "okay";
};

&usb4_1_nhi {
status = "okay";
};

&ps_atc2_cio {
status = "okay";
};

&ps_atc2_pcie {
status = "okay";
};

&ps_atc2_cio_pcie {
status = "okay";
};

&ps_atc2_cio_usb {
status = "okay";
};

&usb4_2_mbox {
status = "okay";
};

&usb4_2_acio {
/delete-property/ apple,pcie-tunnel;
status = "okay";
};

&usb4_2_dart {
/* The same DVA window as the ACIO0 router DART. */
apple,dma-range = <0x100 0x4000 0x0 0xffff0000>;
status = "okay";
};

&usb4_2_nhi {
status = "okay";
};

#include "t6040-j614s-extdisp-hdmi.dtsi"
13 changes: 1 addition & 12 deletions arch/arm64/boot/dts/apple/t6040-j616s-extdisp-usbc.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,7 @@
/delete-property/ apple,always-on;
};

/* tipd switches the PHY into DP alt mode through the connector graph. */
&atcphy0 {
mode-switch;
};

&atcphy1 {
mode-switch;
};

&atcphy2 {
mode-switch;
};
/* The PHYs are the connectors' mode switches: see t6040-usb4-typec.dtsi. */

/*
* Type-C display routes through the display fabric, as T6030 and J700:
Expand Down
115 changes: 0 additions & 115 deletions arch/arm64/boot/dts/apple/t6040-j616s.dts
Original file line number Diff line number Diff line change
Expand Up @@ -229,121 +229,6 @@
status = "okay";
};

/*
* USB4/Thunderbolt on all three Type-C ports: typec0 (left back, ACIO0),
* typec1 (left front, ACIO1) and typec2 (right, ACIO2). The loader hands
* each router its router, adapter and NHI tuning and its DROM over. No PCIe
* tunnels yet: host-to-host (XDomain, thunderbolt-net) and USB4 links only.
*/
&pmgr_cio {
status = "okay";
};

&ps_atc0_cio {
status = "okay";
};

&ps_atc0_pcie {
status = "okay";
};

&ps_atc0_cio_pcie {
status = "okay";
};

&ps_atc0_cio_usb {
status = "okay";
};

&usb4_0_mbox {
status = "okay";
};

&usb4_0_acio {
/delete-property/ apple,pcie-tunnel;
status = "okay";
};

&usb4_0_dart {
/* ADT dart-acio0 vm-base: the NHI addresses its rings below 1 TiB + 4 GiB. */
apple,dma-range = <0x100 0x4000 0x0 0xffff0000>;
status = "okay";
};

&usb4_0_nhi {
status = "okay";
};

&ps_atc1_cio {
status = "okay";
};

&ps_atc1_pcie {
status = "okay";
};

&ps_atc1_cio_pcie {
status = "okay";
};

&ps_atc1_cio_usb {
status = "okay";
};

&usb4_1_mbox {
status = "okay";
};

&usb4_1_acio {
/delete-property/ apple,pcie-tunnel;
status = "okay";
};

&usb4_1_dart {
/* The same DVA window as the ACIO0 router DART. */
apple,dma-range = <0x100 0x4000 0x0 0xffff0000>;
status = "okay";
};

&usb4_1_nhi {
status = "okay";
};

&ps_atc2_cio {
status = "okay";
};

&ps_atc2_pcie {
status = "okay";
};

&ps_atc2_cio_pcie {
status = "okay";
};

&ps_atc2_cio_usb {
status = "okay";
};

&usb4_2_mbox {
status = "okay";
};

&usb4_2_acio {
/delete-property/ apple,pcie-tunnel;
status = "okay";
};

&usb4_2_dart {
/* The same DVA window as the ACIO0 router DART. */
apple,dma-range = <0x100 0x4000 0x0 0xffff0000>;
status = "okay";
};

&usb4_2_nhi {
status = "okay";
};

/*
* The internal PCIe controller (Wi-Fi/Bluetooth, SD reader) needs APCIE_GP,
* APCIE_SYS_GP and APCIE_PHY_SW on top of the always-on ANS/APCIE_ST*
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/apple/t6040-j773s.dts
Original file line number Diff line number Diff line change
Expand Up @@ -797,6 +797,7 @@

#include "t6040-j773s-usb3.dtsi"
#include "t6040-j773s-usb-front.dtsi"
#include "t6040-usb4-typec.dtsi"

/* The video encoder, its DARTs and its power domains. */
&ps_venc0_sys {
Expand Down
73 changes: 73 additions & 0 deletions arch/arm64/boot/dts/apple/t6040-usb4-typec.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
// SPDX-License-Identifier: GPL-2.0+ OR MIT
/*
* M4 Pro (T6040) USB4/Thunderbolt: each Type-C port's connector is linked
* to the USB4 router behind the same ATC PHY. On every T6040 board the ADT
* pairs acioN with atc-phyN (atc-phy-parent) and with the port controller
* whose acio-parent is acioN, and the boards name that connector typecN:
* MacBook Pro 14/16 (J614s, J616s): typec0 left back, typec1 left front,
* typec2 right;
* Mac mini (J773s): typec0 back middle, typec1 back left, typec2 back
* right.
* A port controller skips a link to a disabled router.
*
* Each ATC PHY is its connector's mode switch: the port controller switches
* it between USB3, DP alt mode and USB4/Thunderbolt through the connector
* graph, and finds it by this property.
*/

&atcphy0 {
mode-switch;
};

&atcphy1 {
mode-switch;
};

&atcphy2 {
mode-switch;
};

&usb4_0_acio_tbt {
remote-endpoint = <&typec0_con_tbt>;
};

&usb4_1_acio_tbt {
remote-endpoint = <&typec1_con_tbt>;
};

&usb4_2_acio_tbt {
remote-endpoint = <&typec2_con_tbt>;
};

&typec0 {
ports {
port@2 {
reg = <2>;
typec0_con_tbt: endpoint {
remote-endpoint = <&usb4_0_acio_tbt>;
};
};
};
};

&typec1 {
ports {
port@2 {
reg = <2>;
typec1_con_tbt: endpoint {
remote-endpoint = <&usb4_1_acio_tbt>;
};
};
};
};

&typec2 {
ports {
port@2 {
reg = <2>;
typec2_con_tbt: endpoint {
remote-endpoint = <&usb4_2_acio_tbt>;
};
};
};
};
Loading
Loading