Skip to content
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 "t604x-usb4-typec.dtsi"

/* The video encoder, its DARTs and its power domains. */
&ps_venc0_sys {
Expand Down
Loading
Loading