Skip to content

Commit 526de6c

Browse files
WhatAmISupposedToPutHereWhatAmISupposedToPutHere
committed
dts: apple: t603x: Add aop/admac nodes
Signed-off-by: Sasha Finkelstein <k@chaosmail.tech>
1 parent 401a238 commit 526de6c

9 files changed

Lines changed: 174 additions & 2 deletions

File tree

‎arch/arm64/boot/dts/apple/t6030-j514s.dts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@
6666
interrupts-extended = <&pinctrl_ap 100 IRQ_TYPE_LEVEL_LOW>;
6767
};
6868

69+
&aop_audio {
70+
apple,chassis-name = "J514";
71+
apple,machine-kind = "MacBook Pro";
72+
};
73+
6974
&sound {
7075
compatible = "apple,j514-macaudio", "apple,j314-macaudio", "apple,macaudio";
7176
model = "MacBook Pro J514";

‎arch/arm64/boot/dts/apple/t6030-j516s.dts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@
6666
interrupts-extended = <&pinctrl_ap 100 IRQ_TYPE_LEVEL_LOW>;
6767
};
6868

69+
&aop_audio {
70+
apple,chassis-name = "J516";
71+
apple,machine-kind = "MacBook Pro";
72+
};
73+
6974
&sound {
7075
compatible = "apple,j516-macaudio", "apple,j316-macaudio", "apple,macaudio";
7176
model = "MacBook Pro J516";

‎arch/arm64/boot/dts/apple/t6030.dtsi‎

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@
582582
};
583583

584584
admac: dma-controller@28b200000 {
585-
compatible = "apple,t6030-admac", "apple,t8103-admac";
585+
compatible = "apple,t6030-admac", "apple,t8122-admac";
586586
reg = <0x2 0x8b200000 0x0 0x34000>;
587587
#dma-cells = <1>;
588588
dma-channels = <24>;
@@ -932,6 +932,69 @@
932932
<AIC_IRQ 551 IRQ_TYPE_LEVEL_HIGH>;
933933
};
934934

935+
aop_mbox: mbox@374408000 {
936+
compatible = "apple,t6030-asc-mailbox", "apple,asc-mailbox-v4";
937+
reg = <0x3 0x74408000 0x0 0x4000>;
938+
interrupt-parent = <&aic>;
939+
interrupts = <AIC_IRQ 419 IRQ_TYPE_LEVEL_HIGH>,
940+
<AIC_IRQ 420 IRQ_TYPE_LEVEL_HIGH>,
941+
<AIC_IRQ 421 IRQ_TYPE_LEVEL_HIGH>,
942+
<AIC_IRQ 422 IRQ_TYPE_LEVEL_HIGH>;
943+
interrupt-names = "send-empty", "send-not-empty",
944+
"recv-empty", "recv-not-empty";
945+
#mbox-cells = <0>;
946+
status = "disabled";
947+
};
948+
949+
aop_dart: iommu@374818000 {
950+
compatible = "apple,t6030-dart", "apple,t8110-dart";
951+
reg = <0x3 0x74818000 0x0 0x4000>;
952+
#iommu-cells = <1>;
953+
interrupt-parent = <&aic>;
954+
interrupts = <AIC_IRQ 439 IRQ_TYPE_LEVEL_HIGH>;
955+
status = "disabled";
956+
// apple,dma-range = <0x100 0x0 0x300 0x0>;
957+
};
958+
959+
aop_admac: dma-controller@374980000 {
960+
compatible = "apple,t6030-admac", "apple,t8122-admac";
961+
reg = <0x3 0x74980000 0x0 0x34000>;
962+
#dma-cells = <1>;
963+
dma-channels = <16>;
964+
interrupts-extended = <0>,
965+
<0>,
966+
<&aic AIC_IRQ 460 IRQ_TYPE_LEVEL_HIGH>,
967+
<0>;
968+
iommus = <&aop_dart 10>;
969+
status = "disabled";
970+
};
971+
972+
aop: aop@374c00000 {
973+
compatible = "apple,t6030-aop", "apple,t6020-aop";
974+
reg = <0x3 0x74c00000 0x0 0x1e0000>,
975+
<0x3 0x74400000 0x0 0x6c000>;
976+
mboxes = <&aop_mbox>;
977+
mbox-names = "mbox";
978+
iommus = <&aop_dart 0>;
979+
980+
status = "disabled";
981+
982+
aop_audio: audio {
983+
compatible = "apple,t6030-aop-audio";
984+
dmas = <&aop_admac 1>;
985+
dma-names = "dma";
986+
};
987+
988+
aop_als: als {
989+
compatible = "apple,t6030-aop-als", "apple,t6020-aop-als", "apple,aop-als";
990+
// intentionally empty
991+
};
992+
993+
las {
994+
compatible = "apple,t6030-aop-las", "apple,t6020-aop-las", "apple,aop-las";
995+
};
996+
};
997+
935998
pinctrl_aop: pinctrl@374824000 {
936999
compatible = "apple,t6030-pinctrl", "apple,t8103-pinctrl";
9371000
reg = <0x3 0x74824000 0x0 0x4000>;

‎arch/arm64/boot/dts/apple/t6031-die0.dtsi‎

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,69 @@
161161
<AIC_IRQ 0 910 IRQ_TYPE_LEVEL_HIGH>;
162162
};
163163

164+
aop_mbox: mbox@2a8408000 {
165+
compatible = "apple,t6031-asc-mailbox", "apple,asc-mailbox-v4";
166+
reg = <0x2 0xa8408000 0x0 0x4000>;
167+
interrupt-parent = <&aic>;
168+
interrupts = <AIC_IRQ 0 612 IRQ_TYPE_LEVEL_HIGH>,
169+
<AIC_IRQ 0 613 IRQ_TYPE_LEVEL_HIGH>,
170+
<AIC_IRQ 0 614 IRQ_TYPE_LEVEL_HIGH>,
171+
<AIC_IRQ 0 615 IRQ_TYPE_LEVEL_HIGH>;
172+
interrupt-names = "send-empty", "send-not-empty",
173+
"recv-empty", "recv-not-empty";
174+
#mbox-cells = <0>;
175+
status = "disabled";
176+
};
177+
178+
aop_dart: iommu@2a8818000 {
179+
compatible = "apple,t6031-dart", "apple,t8110-dart";
180+
reg = <0x2 0xa8818000 0x0 0x4000>;
181+
#iommu-cells = <1>;
182+
interrupt-parent = <&aic>;
183+
interrupts = <AIC_IRQ 0 627 IRQ_TYPE_LEVEL_HIGH>;
184+
status = "disabled";
185+
// apple,dma-range = <0x100 0x0 0x300 0x0>;
186+
};
187+
188+
aop_admac: dma-controller@2a8980000 {
189+
compatible = "apple,t6031-admac", "apple,t8122-admac";
190+
reg = <0x2 0xa8980000 0x0 0x34000>;
191+
#dma-cells = <1>;
192+
dma-channels = <16>;
193+
interrupts-extended = <0>,
194+
<0>,
195+
<&aic AIC_IRQ 0 630 IRQ_TYPE_LEVEL_HIGH>,
196+
<0>;
197+
iommus = <&aop_dart 10>;
198+
status = "disabled";
199+
};
200+
201+
aop: aop@2a8c00000 {
202+
compatible = "apple,t6031-aop", "apple,t6020-aop";
203+
reg = <0x2 0xa8c00000 0x0 0x2a0000>,
204+
<0x2 0xa8400000 0x0 0x6c000>;
205+
mboxes = <&aop_mbox>;
206+
mbox-names = "mbox";
207+
iommus = <&aop_dart 0>;
208+
209+
status = "disabled";
210+
211+
aop_audio: audio {
212+
compatible = "apple,t6031-aop-audio", "apple,t6030-aop-audio";
213+
dmas = <&aop_admac 1>;
214+
dma-names = "dma";
215+
};
216+
217+
aop_als: als {
218+
compatible = "apple,t6031-aop-als", "apple,aop-als";
219+
// intentionally empty
220+
};
221+
222+
las {
223+
compatible = "apple,t6031-aop-las", "apple,aop-las";
224+
};
225+
};
226+
164227
mtp: mtp@2ac400000 {
165228
compatible = "apple,t6031-mtp", "apple,t8122-rtk-helper-asc4", "apple,mtp", "apple,rtk-helper-asc4";
166229
reg = <0x2 0xac400000 0x0 0x4000>,
@@ -457,7 +520,7 @@
457520
};
458521

459522
admac: dma-controller@393200000 {
460-
compatible = "apple,t6031-admac", "apple,t8103-admac";
523+
compatible = "apple,t6031-admac", "apple,t8122-admac";
461524
reg = <0x3 0x93200000 0x0 0x34000>;
462525
#dma-cells = <1>;
463526
dma-channels = <24>;

‎arch/arm64/boot/dts/apple/t6031-j514c.dts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
brcm,board-type = "apple,texa";
3030
};
3131

32+
&aop_audio {
33+
apple,chassis-name = "J514";
34+
apple,machine-kind = "MacBook Pro";
35+
};
36+
3237
&sound {
3338
compatible = "apple,j514-macaudio", "apple,j314-macaudio", "apple,macaudio";
3439
model = "MacBook Pro J514";

‎arch/arm64/boot/dts/apple/t6031-j516c.dts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
brcm,board-type = "apple,jura";
3030
};
3131

32+
&aop_audio {
33+
apple,chassis-name = "J516";
34+
apple,machine-kind = "MacBook Pro";
35+
};
36+
3237
&sound {
3338
compatible = "apple,j516-macaudio", "apple,j316-macaudio", "apple,macaudio";
3439
model = "MacBook Pro J516";

‎arch/arm64/boot/dts/apple/t6034-j514m.dts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
brcm,board-type = "apple,texa";
3030
};
3131

32+
&aop_audio {
33+
apple,chassis-name = "J514";
34+
apple,machine-kind = "MacBook Pro";
35+
};
36+
3237
&sound {
3338
compatible = "apple,j514-macaudio", "apple,j314-macaudio", "apple,macaudio";
3439
model = "MacBook Pro J514";

‎arch/arm64/boot/dts/apple/t6034-j516m.dts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
brcm,board-type = "apple,jura";
3030
};
3131

32+
&aop_audio {
33+
apple,chassis-name = "J516";
34+
apple,machine-kind = "MacBook Pro";
35+
};
36+
3237
&sound {
3338
compatible = "apple,j516-macaudio", "apple,j316-macaudio", "apple,macaudio";
3439
model = "MacBook Pro J516";

‎arch/arm64/boot/dts/apple/t603x-j514-j516.dtsi‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,22 @@
251251
status = "okay";
252252
};
253253

254+
&aop_mbox {
255+
status = "okay";
256+
};
257+
258+
&aop_dart {
259+
status = "okay";
260+
};
261+
262+
&aop_admac {
263+
status = "okay";
264+
};
265+
266+
&aop {
267+
status = "okay";
268+
};
269+
254270
/ {
255271
sound: sound {
256272
/* compatible is set per machine */

0 commit comments

Comments
 (0)