Skip to content

Commit b687e24

Browse files
committed
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 <j@jannau.net>
1 parent 19b9e1b commit b687e24

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
serial0 = &serial0;
@@ -78,6 +79,49 @@
7879
};
7980
};
8081

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

421469
&ps_atc3_usb_aon {
422470
/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)