Skip to content
Merged
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
64 changes: 46 additions & 18 deletions arch/arm64/boot/dts/apple/t6050-j714s-display.dtsi
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: GPL-2.0+ OR MIT
/*
* J714s external displays: DisplayPort alt mode on the left-front and right ports and USB4
* DisplayPort tunnels on the right port. dcpext0 and dcpext2 drive the DP alt mode and tunnel
* routes, dcpext1 a third tunnel on the right port only; dcpext3 is the pair for modes that
* need two pipelines. The left-back port (ATC0) is the debug port and is not described.
* J714s external displays: DisplayPort alt mode and USB4 DisplayPort tunnels on the left-front
* and right ports. dcpext0 and dcpext2 drive the DP alt mode and tunnel routes, dcpext1 a third
* tunnel on either port; dcpext3 is the pair for modes that need two pipelines. The left-back
* port (ATC0) is the debug port and is not described.
* Addresses and interrupts are from the J714sAP ADT. The boot loader hands each engine over: it
* enables the engine, its mailbox and DARTs, publishes its bandwidth scratch and adds its
* display DART to the display subsystem.
Expand All @@ -14,25 +14,30 @@
apple,connector-type = "USB-C";
apple,dptx-die = <0>;
/*
* A third pipeline for USB4 DP tunnels on the right port, so a dock can
* drive three displays as on macOS. Routing dcpext1 stops it being a
* merged-mode peer; dcpext0, dcpext1 and dcpext2 then pair with dcpext3,
* so only one display wider than one pipeline runs at a time.
* Crossbar source 2 (dispext1 port 0) follows the 2 * dispext pattern of
* dcpext0 (0) and dcpext2 (4), and the T6040 dcpext1 (2).
* No mode-switch: hpm2 already has TYPEC_MUX_MAX_DEVS (3) mode-switch
* providers; tunnels find the port through the endpoint, not the mux.
* A third pipeline for USB4 DP tunnels on the right and left-front
* ports, so a dock on either can drive three displays as on macOS.
* Routing dcpext1 stops it being a merged-mode peer; dcpext0, dcpext1
* and dcpext2 then pair with dcpext3, so only one display wider than
* one pipeline runs at a time.
* Crossbar source 2 (dispext1 port 0) on both crossbars follows the
* 2 * dispext pattern of dcpext0 (0) and dcpext2 (4), and the T6040
* dcpext1 (2).
* No mode-switch: hpm1 and hpm2 already have TYPEC_MUX_MAX_DEVS (3)
* mode-switch providers each (the ATC PHY, dcpext0 and dcpext2);
* tunnels find the port through the endpoint, not the mux.
* apple,tunnel-only keeps DP alt mode displays off it: only tunnels
* have been driven through it.
*/
apple,typec-dptx-phys = <2>;
apple,typec-mux-indices = <2>;
phys = <&atc2_phy 6>;
phy-names = "typec0";
apple,typec-dptx-phys = <2 1>;
apple,typec-mux-indices = <2 2>;
phys = <&atc2_phy 6>, <&atc1_phy 6>;
phy-names = "typec0", "typec1";
mux-controls = <&atc2_xbar 0>, <&atc2_xbar 1>, <&atc2_xbar 2>, <&atc2_xbar 3>,
<&atc2_xbar 4>;
<&atc2_xbar 4>, <&atc1_dpxbar 0>, <&atc1_dpxbar 1>, <&atc1_dpxbar 2>,
<&atc1_dpxbar 3>, <&atc1_dpxbar 4>;
mux-control-names = "typec0", "typec0-dpin0", "typec0-dpin1", "typec0-dpin2",
"typec0-dpin3";
"typec0-dpin3", "typec1", "typec1-dpin0", "typec1-dpin1",
"typec1-dpin2", "typec1-dpin3";

typec-routes {
#address-cells = <1>;
Expand All @@ -48,6 +53,17 @@
};
};
};

route@1 {
reg = <1>;
apple,tunnel-only;

port {
dcpext1_left: endpoint {
remote-endpoint = <&typec1_dp2>;
};
};
};
};
};

Expand Down Expand Up @@ -174,6 +190,11 @@
reg = <1>;
remote-endpoint = <&dcpext2_left>;
};

typec1_dp2: endpoint@2 {
reg = <2>;
remote-endpoint = <&dcpext1_left>;
};
};
};
};
Expand Down Expand Up @@ -284,6 +305,13 @@
interrupt-names = "dpin0", "dpin1", "dpin2", "dpin3";
};

/* The left-front router's DP IN interrupts (atc1-dpin0..3, as in the T6050 inventory and J716c) */
&acio1 {
interrupts = <AIC_IRQ 0 1635 IRQ_TYPE_LEVEL_HIGH>, <AIC_IRQ 0 1636 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 0 1641 IRQ_TYPE_LEVEL_HIGH>, <AIC_IRQ 0 1642 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "dpin0", "dpin1", "dpin2", "dpin3";
};

/* The right router's suppliers, disabled in the inventory */
&ps_atc2_cio {
status = "okay";
Expand Down
Loading