Skip to content

Commit 5dc5b1d

Browse files
jannaumarcan
authored andcommitted
arm64: dts: apple: Fill device node for dp2hdmi on Macbook Pros
The HDMI output on the 14 and 16 inch Macbook Pros with M1/M2 Pro/Max is driven by an unused ATC port using the phy and crossbar. The DP output from any dcpext display controller is routed to a Kinetic DP2HDMI converter (MCDP2920 and a unknown HDMI 2.1 capable variant). Signed-off-by: Janne Grunau <[email protected]>
1 parent 4863bec commit 5dc5b1d

2 files changed

Lines changed: 53 additions & 0 deletions

File tree

arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
atcphy3 = &atcphy3;
2020
bluetooth0 = &bluetooth0;
2121
dcp = &dcp;
22+
dcpext0 = &dcpext0;
2223
disp0 = &display;
2324
disp0_piodma = &disp0_piodma;
2425
nvram = &nvram;
@@ -77,6 +78,49 @@
7778
};
7879
};
7980

81+
&display {
82+
iommus = <&disp0_dart 0>, <&dispext0_dart 0>;
83+
};
84+
85+
&dispext0_dart {
86+
status = "okay";
87+
};
88+
89+
&dcpext0_dart {
90+
status = "okay";
91+
};
92+
93+
&dcpext0_mbox {
94+
status = "okay";
95+
};
96+
97+
&dcpext0 {
98+
/* enabled by the loader */
99+
apple,connector-type = "HDMI-A";
100+
101+
/* HDMI HPD gpio, used as interrupt*/
102+
hdmi-hpd-gpios = <&pinctrl_nub 15 GPIO_ACTIVE_HIGH>;
103+
104+
hdmi-pwren-gpios = <&smc_gpio 23 GPIO_ACTIVE_HIGH>;
105+
dp2hdmi-pwren-gpios = <&smc_gpio 6 GPIO_ACTIVE_HIGH>;
106+
107+
phy-names = "dp-phy";
108+
phys = <&atcphy3 PHY_TYPE_DP>;
109+
phy-names = "dp-phy";
110+
mux-controls = <&atcphy3_xbar 0>;
111+
mux-control-names = "dp-xbar";
112+
mux-index = <0>;
113+
apple,dptx-phy = <3>;
114+
};
115+
116+
&atcphy3 {
117+
apple,mode-fixed-dp;
118+
};
119+
120+
&atcphy3_xbar {
121+
status = "okay";
122+
};
123+
80124
/* USB Type C */
81125
&i2c0 {
82126
hpm0: usb-pd@38 {
@@ -416,6 +460,10 @@
416460
&dwc3_3 {
417461
status = "disabled";
418462
};
463+
/* Delete unused dwc3_3 to prevent dt_disable_missing_devs() from disabling
464+
* atcphy3 via phandle references from a disablecd device.
465+
*/
466+
/delete-node/ &dwc3_3;
419467

420468
&ps_atc3_usb_aon {
421469
/delete-property/ apple,always-on;

arch/arm64/boot/dts/apple/t602x-j414-j416.dtsi

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@
3030
apple,always-on;
3131
};
3232

33+
&dcpext0 {
34+
/* HDMI HPD gpio, used as interrupt*/
35+
hdmi-hpd-gpios = <&pinctrl_aop 25 GPIO_ACTIVE_HIGH>;
36+
};
37+
3338
&hpm0 {
3439
interrupts = <44 IRQ_TYPE_LEVEL_LOW>;
3540
};

0 commit comments

Comments
 (0)