Skip to content

Commit 205d2f7

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

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
@@ -25,6 +25,10 @@
2525
brcm,board-type = "apple,okinawa";
2626
};
2727

28+
&dpaudio0 {
29+
status = "okay";
30+
};
31+
2832
&sound {
2933
compatible = "apple,j375-macaudio", "apple,macaudio";
3034
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
@@ -23,6 +23,7 @@
2323
disp0 = &display;
2424
disp0_piodma = &disp0_piodma;
2525
serial0 = &serial0;
26+
sio = &sio;
2627
wifi0 = &wifi0;
2728
};
2829

@@ -107,6 +108,10 @@
107108
apple,dptx-phy = <3>;
108109
};
109110

111+
&dpaudio1 {
112+
status = "okay";
113+
};
114+
110115
&atcphy3 {
111116
apple,mode-fixed-dp;
112117
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#endif
2424
ethernet0 = &ethernet0;
2525
serial0 = &serial0;
26+
sio = &sio;
2627
wifi0 = &wifi0;
2728
};
2829

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,14 @@
8989
&dcpext0_mbox {
9090
status = "okay";
9191
};
92+
&dpaudio1 {
93+
status = "okay";
94+
};
9295
&dcpext0 {
9396
#else
97+
&dpaudio0 {
98+
status = "okay";
99+
};
94100
&dcp {
95101
#endif
96102
status = "okay";

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,14 @@
9191
&dcpext0_mbox {
9292
status = "okay";
9393
};
94+
&dpaudio1 {
95+
status = "okay";
96+
};
9497
&dcpext0 {
9598
#else
99+
&dpaudio0 {
100+
status = "okay";
101+
};
96102
&dcp {
97103
#endif
98104
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)