Skip to content

arm64: dts: apple: t6022-j475d: enable DP alt mode on the rear USB-C ports #462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jcrowthe wants to merge 1 commit into
base: integration/aurora
Choose a base branch
from
Open

arm64: dts: apple: t6022-j475d: enable DP alt mode on the rear USB-C ports #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions arch/arm64/boot/dts/apple/t6022-j475d.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,15 @@
power-domains = <&ps_dispext0_cpu0_die1>, <&ps_dptx_phy_ps_die1>;
};

/*
* HDMI scans out through dispext0 on die 1, and the rear USB-C ports through
* dcpext1/dispext1 on die 0 (see t602x-j474-j475.dtsi).
*/
&display {
iommus = <&dispext0_dart_die1 0 0x100 0x0 0x10 0x0>,
<&dispext1_dart 0 0x100 0x0 0x10 0x0>;
};

&dcpext0_die1 {
// J180 misses "function-dp2hdmi_pwr_en"
dp2hdmi-pwren-gpios = <&smc_gpio 25 GPIO_ACTIVE_HIGH>;
Expand Down
15 changes: 14 additions & 1 deletion arch/arm64/boot/dts/apple/t602x-j474-j475.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#ifdef APPLE_T602X_NON_ULTRA
/ {
aliases {
dcpext1 = &dcpext1;
/* Same Thunderbolt aliases as the 14/16-inch boards. This mini
* brings up a fourth controller.
*/
Expand Down Expand Up @@ -67,6 +66,19 @@
iommus = <&dispext0_dart 0 0x100 0x0 0x10 0x0>,
<&dispext1_dart 0 0x100 0x0 0x10 0x0>;
};
#endif

/*
* dcpext1 on die 0 drives the rear USB-C ports through the display crossbar
* on all of these boards, M2 Ultra included: macOS routes a DP alt mode
* display on the J475d's rear ports to DCPEXT1 as well. Only the USB4 and
* PCIe-C wiring below stays non-Ultra.
*/
/ {
aliases {
dcpext1 = &dcpext1;
};
};

&dispext1_dart {
status = "okay";
Expand Down Expand Up @@ -229,6 +241,7 @@
apple,always-on;
};

#ifdef APPLE_T602X_NON_ULTRA
&usb4_0_acio {
apple,pcie-tunnel = <&usb4_0_pcie_tunnel>;
};
Expand Down
Loading