Skip to content

Commit fdca4e6

Browse files
jannaumarcan
authored andcommitted
arm64: dts: apple: t6020-j474,t6021-j475: Enable dcp/dptx-phy/dp2hdmi
After all parts are in place enable the DCP on the M2 Pro Mac Mini and the M2 Max Mac Studio for HDMI output. Signed-off-by: Janne Grunau <[email protected]>
1 parent 7f34a45 commit fdca4e6

3 files changed

Lines changed: 64 additions & 5 deletions

File tree

arch/arm64/boot/dts/apple/t6020-j474s.dts

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,51 @@
4545
model = "Mac mini J474";
4646
};
4747

48+
&lpdptxphy {
49+
status = "okay";
50+
};
51+
52+
#define USE_DCPEXT0 0
53+
54+
#if USE_DCPEXT0
55+
/ {
56+
aliases {
57+
dcpext0 = &dcpext0;
58+
};
59+
};
60+
&dcp {
61+
status = "disabled";
62+
};
63+
&display {
64+
iommus = <&dispext0_dart 0>;
65+
};
66+
&dispext0_dart {
67+
status = "okay";
68+
};
69+
&dcpext0_dart {
70+
status = "okay";
71+
};
72+
&dcpext0_mbox {
73+
status = "okay";
74+
};
75+
&dcpext0 {
76+
#else
77+
&dcp {
78+
#endif
79+
status = "okay";
80+
apple,connector-type = "HDMI-A";
81+
82+
/* HDMI HPD gpio, used as interrupt*/
83+
hdmi-hpd-gpios = <&pinctrl_aop 25 GPIO_ACTIVE_HIGH>;
84+
85+
hdmi-pwren-gpios = <&smc_gpio 23 GPIO_ACTIVE_HIGH>;
86+
dp2hdmi-pwren-gpios = <&smc_gpio 25 GPIO_ACTIVE_HIGH>;
87+
88+
phys = <&lpdptxphy>;
89+
phy-names = "dp-phy";
90+
apple,dptx-phy = <4>;
91+
};
92+
4893
&gpu {
4994
/* Apple does not do this, but they probably should */
5095
apple,perf-base-pstate = <3>;

arch/arm64/boot/dts/apple/t6021-j475c.dts

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,22 @@
4747
compatible = "apple,j475-macaudio", "apple,j375-macaudio", "apple,macaudio";
4848
model = "Mac Studio J475";
4949
};
50+
51+
&lpdptxphy {
52+
status = "okay";
53+
};
54+
55+
&dcp {
56+
status = "okay";
57+
apple,connector-type = "HDMI-A";
58+
59+
/* HDMI HPD gpio, used as interrupt*/
60+
hdmi-hpd-gpios = <&pinctrl_aop 25 GPIO_ACTIVE_HIGH>;
61+
62+
hdmi-pwren-gpios = <&smc_gpio 23 GPIO_ACTIVE_HIGH>;
63+
dp2hdmi-pwren-gpios = <&smc_gpio 25 GPIO_ACTIVE_HIGH>;
64+
65+
phys = <&lpdptxphy>;
66+
phy-names = "dp-phy";
67+
apple,dptx-phy = <4>;
68+
};

arch/arm64/boot/dts/apple/t602x-j474-j475.dtsi

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@
2121
power-domains = <&ps_disp0_cpu0>, <&ps_dptx_phy_ps>;
2222
};
2323

24-
/* disable dcp until it is supported */
25-
&dcp {
26-
status = "disabled";
27-
};
28-
2924
&hpm0 {
3025
interrupts = <44 IRQ_TYPE_LEVEL_LOW>;
3126
};

0 commit comments

Comments
 (0)