Skip to content

Commit e326cda

Browse files
committed
arm64: apple: t60xx: Enable DP/HMI audio nodes on all devices
Signed-off-by: Janne Grunau <j@jannau.net>
1 parent fbd4a97 commit e326cda

8 files changed

Lines changed: 36 additions & 0 deletions

File tree

arch/arm64/boot/dts/apple/t6001-j375c.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
model = "Apple Mac Studio (M1 Max, 2022)";
1818
};
1919

20+
&dpaudio0 {
21+
status = "okay";
22+
};
23+
2024
&sound {
2125
compatible = "apple,j375-macaudio", "apple,macaudio";
2226
model = "Mac Studio J375";

arch/arm64/boot/dts/apple/t6002-j375d.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
};
2222
};
2323

24+
&dpaudio0 {
25+
status = "okay";
26+
};
27+
2428
&sound {
2529
compatible = "apple,j375-macaudio", "apple,macaudio";
2630
model = "Mac Studio J375";

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
disp0_piodma = &disp0_piodma;
2525
nvram = &nvram;
2626
serial0 = &serial0;
27+
sio = &sio;
2728
wifi0 = &wifi0;
2829
};
2930

@@ -114,6 +115,10 @@
114115
apple,dptx-phy = <3>;
115116
};
116117

118+
&dpaudio1 {
119+
status = "okay";
120+
};
121+
117122
&atcphy3 {
118123
apple,mode-fixed-dp;
119124
};

arch/arm64/boot/dts/apple/t600x-j375.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
ethernet0 = &ethernet0;
2525
nvram = &nvram;
2626
serial0 = &serial0;
27+
sio = &sio;
2728
wifi0 = &wifi0;
2829
};
2930

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,14 @@
7878
&dcpext0_mbox {
7979
status = "okay";
8080
};
81+
&dpaudio1 {
82+
status = "okay";
83+
};
8184
&dcpext0 {
8285
#else
86+
&dpaudio0 {
87+
status = "okay";
88+
};
8389
&dcp {
8490
#endif
8591
status = "okay";

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,14 @@
8282
&dcpext0_mbox {
8383
status = "okay";
8484
};
85+
&dpaudio1 {
86+
status = "okay";
87+
};
8588
&dcpext0 {
8689
#else
90+
&dpaudio0 {
91+
status = "okay";
92+
};
8793
&dcp {
8894
#endif
8995
status = "okay";

arch/arm64/boot/dts/apple/t6022-j475d.dts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,14 @@
2222
atcphy4 = &atcphy0_die1;
2323
atcphy5 = &atcphy1_die1;
2424
/delete-property/ dcp;
25+
/delete-property/ sio;
2526
};
2627
};
2728

29+
&sio {
30+
status = "disabled";
31+
};
32+
2833
&framebuffer0 {
2934
power-domains = <&ps_dispext0_cpu0_die1>, <&ps_dptx_phy_ps_die1>;
3035
};

arch/arm64/boot/dts/apple/t6022-jxxxd.dtsi

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
aliases {
1414
dcpext4 = &dcpext0_die1;
1515
disp0 = &display;
16+
sio1 = &sio_die1;
1617
};
1718
};
1819

@@ -53,6 +54,10 @@
5354
apple,dptx-die = <1>;
5455
};
5556

57+
&dpaudio1_die1 {
58+
status = "okay";
59+
};
60+
5661
/* delete missing dcp0/disp0 */
5762

5863
/delete-node/ &disp0_dart;

0 commit comments

Comments
 (0)