Skip to content

Commit 5c0eb4a

Browse files
committed
arm64: dts: apple: aop: Add hack to enforce probe order
Starting in 6.14 the probe order between aop_admac and aop/aop_audio ends up wrong with aop_audio probing before aop_admac and not being to able to handle -EPROBE_DEFER. Signed-off-by: Janne Grunau <j@jannau.net>
1 parent fb611a6 commit 5c0eb4a

4 files changed

Lines changed: 16 additions & 0 deletions

File tree

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,10 @@
232232
mbox-names = "mbox";
233233
iommus = <&aop_dart 0>;
234234

235+
/* HACK: ensure probe order */
236+
dmas = <&aop_admac 1023>;
237+
dma-names = "invalid-order-only";
238+
235239
status = "disabled";
236240

237241
aop_audio: audio {

arch/arm64/boot/dts/apple/t602x-die0.dtsi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,10 @@
236236
mbox-names = "mbox";
237237
iommus = <&aop_dart 0>;
238238

239+
/* HACK: ensure probe order */
240+
dmas = <&aop_admac 1023>;
241+
dma-names = "invalid-order-only";
242+
239243
status = "disabled";
240244

241245
aop_audio: audio {

arch/arm64/boot/dts/apple/t8103.dtsi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1397,6 +1397,10 @@
13971397
mbox-names = "mbox";
13981398
iommus = <&aop_dart 0>;
13991399

1400+
/* HACK: ensure probe order */
1401+
dmas = <&aop_admac 1023>;
1402+
dma-names = "invalid-order-only";
1403+
14001404
status = "disabled";
14011405

14021406
aop_audio: audio {

arch/arm64/boot/dts/apple/t8112.dtsi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1484,6 +1484,10 @@
14841484
mbox-names = "mbox";
14851485
iommus = <&aop_dart 0>;
14861486

1487+
/* HACK: ensure probe order */
1488+
dmas = <&aop_admac 1023>;
1489+
dma-names = "invalid-order-only";
1490+
14871491
status = "disabled";
14881492

14891493
aop_audio: audio {

0 commit comments

Comments
 (0)