Skip to content

Commit 5fa3577

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

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
@@ -25,6 +25,7 @@
2525
disp0 = &display;
2626
disp0_piodma = &disp0_piodma;
2727
serial0 = &serial0;
28+
sio = &sio;
2829
wifi0 = &wifi0;
2930
};
3031

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

112+
&dpaudio1 {
113+
status = "okay";
114+
};
115+
111116
&atcphy3_xbar {
112117
status = "okay";
113118
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#endif
2626
ethernet0 = &ethernet0;
2727
serial0 = &serial0;
28+
sio = &sio;
2829
wifi0 = &wifi0;
2930
};
3031

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,14 @@
9696
&dcpext0_mbox {
9797
status = "okay";
9898
};
99+
&dpaudio1 {
100+
status = "okay";
101+
};
99102
&dcpext0 {
100103
#else
104+
&dpaudio0 {
105+
status = "okay";
106+
};
101107
&dcp {
102108
#endif
103109
status = "okay";

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,14 @@
9292
&dcpext0_mbox {
9393
status = "okay";
9494
};
95+
&dpaudio1 {
96+
status = "okay";
97+
};
9598
&dcpext0 {
9699
#else
100+
&dpaudio0 {
101+
status = "okay";
102+
};
97103
&dcp {
98104
#endif
99105
status = "okay";

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

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

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

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
/delete-node/ &disp0_dart;
5863
/delete-node/ &dcp_dart;

0 commit comments

Comments
 (0)