Skip to content
Closed
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"
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
125 changes: 119 additions & 6 deletions arch/arm64/boot/dts/apple/t604x-j614-j616-usb4.dtsi
Original file line number Diff line number Diff line change
@@ -1,13 +1,126 @@
// SPDX-License-Identifier: GPL-2.0+ OR MIT
/*
* MacBook Pro (14-inch and 16-inch, M4 Pro) USB4/Thunderbolt: each Type-C
* port's connector is linked to the USB4 router behind the same ATC PHY
* (ADT acioN atc-phy-parent = atc-phyN): typec0 (left back) to ACIO0,
* typec1 (left front) to ACIO1, typec2 (right) to ACIO2. The routers stay
* disabled, and a port controller skips a link to a disabled router, so this
* changes nothing until a board enables them.
* MacBook Pro (14-inch and 16-inch, M4 Pro) USB4/Thunderbolt on all three
* Type-C ports. The J614s and J616s ADTs have the same acio0-2, dart-acio0-2
* and acio-cpu0-2, and pair each router with the ATC PHY of one port (ADT
* acioN atc-phy-parent = atc-phyN): typec0 (left back) is linked to ACIO0,
* typec1 (left front) to ACIO1, typec2 (right) to 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";
};


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