Skip to content

Commit 99d23b8

Browse files
retro98boyigorpecovnik
retro98boy
authored and
igorpecovnik
committed
CAINIAO CNIoT-CORE: change sound card name and update DAI links
1 parent 923dc8d commit 99d23b8

File tree

3 files changed

+98
-62
lines changed

3 files changed

+98
-62
lines changed

‎patch/kernel/archive/meson64-6.12/dt/meson-g12b-a311d-cainiao-cniot-core.dts

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -205,21 +205,21 @@
205205

206206
sound {
207207
compatible = "amlogic,axg-sound-card";
208-
model = "CNIoT-CORE";
209-
audio-widgets = "Line", "Lineout";
210-
audio-aux-devs = <&tdmout_b>, <&tdmout_c>, <&ht6872>;
211-
audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
208+
model = "cainiao-cniot-core";
209+
audio-widgets = "Speaker", "Internal Speaker";
210+
audio-aux-devs = <&tdmout_a>, <&tdmout_b>, <&ht6872>;
211+
audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0",
212+
"TDMOUT_A IN 1", "FRDDR_B OUT 0",
213+
"TDMOUT_A IN 2", "FRDDR_C OUT 0",
214+
"TDM_A Playback", "TDMOUT_A OUT",
215+
"TDMOUT_B IN 0", "FRDDR_A OUT 1",
212216
"TDMOUT_B IN 1", "FRDDR_B OUT 1",
213217
"TDMOUT_B IN 2", "FRDDR_C OUT 1",
214218
"TDM_B Playback", "TDMOUT_B OUT",
215-
"TDMOUT_C IN 0", "FRDDR_A OUT 2",
216-
"TDMOUT_C IN 1", "FRDDR_B OUT 2",
217-
"TDMOUT_C IN 2", "FRDDR_C OUT 2",
218-
"TDM_C Playback", "TDMOUT_C OUT",
219219
"HT6872 INL", "ACODEC LOLP",
220220
"HT6872 INR", "ACODEC LORP",
221-
"Lineout", "HT6872 OUTL",
222-
"Lineout", "HT6872 OUTR";
221+
"Internal Speaker", "HT6872 OUTL",
222+
"Internal Speaker", "HT6872 OUTR";
223223

224224
clocks = <&clkc CLKID_MPLL2>,
225225
<&clkc CLKID_MPLL0>,
@@ -247,27 +247,39 @@
247247

248248
/* 8ch hdmi interface */
249249
dai-link-3 {
250-
sound-dai = <&tdmif_b>;
250+
sound-dai = <&tdmif_a>;
251251
dai-format = "i2s";
252252
dai-tdm-slot-tx-mask-0 = <1 1>;
253253
dai-tdm-slot-tx-mask-1 = <1 1>;
254254
dai-tdm-slot-tx-mask-2 = <1 1>;
255255
dai-tdm-slot-tx-mask-3 = <1 1>;
256256
mclk-fs = <256>;
257257

258-
codec {
259-
sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>;
258+
codec-0 {
259+
sound-dai = <&tohdmitx TOHDMITX_I2S_IN_A>;
260+
};
261+
262+
codec-1 {
263+
sound-dai = <&toacodec TOACODEC_IN_A>;
260264
};
261265
};
262266

267+
/* 8ch hdmi interface */
263268
dai-link-4 {
264-
sound-dai = <&tdmif_c>;
269+
sound-dai = <&tdmif_b>;
265270
dai-format = "i2s";
266271
dai-tdm-slot-tx-mask-0 = <1 1>;
272+
dai-tdm-slot-tx-mask-1 = <1 1>;
273+
dai-tdm-slot-tx-mask-2 = <1 1>;
274+
dai-tdm-slot-tx-mask-3 = <1 1>;
267275
mclk-fs = <256>;
268276

269-
codec {
270-
sound-dai = <&toacodec TOACODEC_IN_C>;
277+
codec-0 {
278+
sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>;
279+
};
280+
281+
codec-1 {
282+
sound-dai = <&toacodec TOACODEC_IN_B>;
271283
};
272284
};
273285

@@ -526,19 +538,19 @@
526538
};
527539
};
528540

529-
&tdmif_b {
541+
&tdmif_a {
530542
status = "okay";
531543
};
532544

533-
&tdmif_c {
545+
&tdmif_b {
534546
status = "okay";
535547
};
536548

537-
&tdmout_b {
549+
&tdmout_a {
538550
status = "okay";
539551
};
540552

541-
&tdmout_c {
553+
&tdmout_b {
542554
status = "okay";
543555
};
544556

‎patch/kernel/archive/meson64-6.15/dt/meson-g12b-a311d-cainiao-cniot-core.dts

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -205,21 +205,21 @@
205205

206206
sound {
207207
compatible = "amlogic,axg-sound-card";
208-
model = "CNIoT-CORE";
209-
audio-widgets = "Line", "Lineout";
210-
audio-aux-devs = <&tdmout_b>, <&tdmout_c>, <&ht6872>;
211-
audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
208+
model = "cainiao-cniot-core";
209+
audio-widgets = "Speaker", "Internal Speaker";
210+
audio-aux-devs = <&tdmout_a>, <&tdmout_b>, <&ht6872>;
211+
audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0",
212+
"TDMOUT_A IN 1", "FRDDR_B OUT 0",
213+
"TDMOUT_A IN 2", "FRDDR_C OUT 0",
214+
"TDM_A Playback", "TDMOUT_A OUT",
215+
"TDMOUT_B IN 0", "FRDDR_A OUT 1",
212216
"TDMOUT_B IN 1", "FRDDR_B OUT 1",
213217
"TDMOUT_B IN 2", "FRDDR_C OUT 1",
214218
"TDM_B Playback", "TDMOUT_B OUT",
215-
"TDMOUT_C IN 0", "FRDDR_A OUT 2",
216-
"TDMOUT_C IN 1", "FRDDR_B OUT 2",
217-
"TDMOUT_C IN 2", "FRDDR_C OUT 2",
218-
"TDM_C Playback", "TDMOUT_C OUT",
219219
"HT6872 INL", "ACODEC LOLP",
220220
"HT6872 INR", "ACODEC LORP",
221-
"Lineout", "HT6872 OUTL",
222-
"Lineout", "HT6872 OUTR";
221+
"Internal Speaker", "HT6872 OUTL",
222+
"Internal Speaker", "HT6872 OUTR";
223223

224224
clocks = <&clkc CLKID_MPLL2>,
225225
<&clkc CLKID_MPLL0>,
@@ -247,27 +247,39 @@
247247

248248
/* 8ch hdmi interface */
249249
dai-link-3 {
250-
sound-dai = <&tdmif_b>;
250+
sound-dai = <&tdmif_a>;
251251
dai-format = "i2s";
252252
dai-tdm-slot-tx-mask-0 = <1 1>;
253253
dai-tdm-slot-tx-mask-1 = <1 1>;
254254
dai-tdm-slot-tx-mask-2 = <1 1>;
255255
dai-tdm-slot-tx-mask-3 = <1 1>;
256256
mclk-fs = <256>;
257257

258-
codec {
259-
sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>;
258+
codec-0 {
259+
sound-dai = <&tohdmitx TOHDMITX_I2S_IN_A>;
260+
};
261+
262+
codec-1 {
263+
sound-dai = <&toacodec TOACODEC_IN_A>;
260264
};
261265
};
262266

267+
/* 8ch hdmi interface */
263268
dai-link-4 {
264-
sound-dai = <&tdmif_c>;
269+
sound-dai = <&tdmif_b>;
265270
dai-format = "i2s";
266271
dai-tdm-slot-tx-mask-0 = <1 1>;
272+
dai-tdm-slot-tx-mask-1 = <1 1>;
273+
dai-tdm-slot-tx-mask-2 = <1 1>;
274+
dai-tdm-slot-tx-mask-3 = <1 1>;
267275
mclk-fs = <256>;
268276

269-
codec {
270-
sound-dai = <&toacodec TOACODEC_IN_C>;
277+
codec-0 {
278+
sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>;
279+
};
280+
281+
codec-1 {
282+
sound-dai = <&toacodec TOACODEC_IN_B>;
271283
};
272284
};
273285

@@ -526,19 +538,19 @@
526538
};
527539
};
528540

529-
&tdmif_b {
541+
&tdmif_a {
530542
status = "okay";
531543
};
532544

533-
&tdmif_c {
545+
&tdmif_b {
534546
status = "okay";
535547
};
536548

537-
&tdmout_b {
549+
&tdmout_a {
538550
status = "okay";
539551
};
540552

541-
&tdmout_c {
553+
&tdmout_b {
542554
status = "okay";
543555
};
544556

‎patch/u-boot/v2025.04/board_cainiao-cniot-core/add-board-cainiao-cniot-core.patch

Lines changed: 34 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,10 @@ index 00000000..345d9b86
128128
+CONFIG_ZSTD=y
129129
diff --git a/dts/upstream/src/arm64/amlogic/meson-g12b-a311d-cainiao-cniot-core.dts b/dts/upstream/src/arm64/amlogic/meson-g12b-a311d-cainiao-cniot-core.dts
130130
new file mode 100644
131-
index 00000000..53318e9d
131+
index 00000000..bdfcce04
132132
--- /dev/null
133133
+++ b/dts/upstream/src/arm64/amlogic/meson-g12b-a311d-cainiao-cniot-core.dts
134-
@@ -0,0 +1,588 @@
134+
@@ -0,0 +1,600 @@
135135
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
136136
+/*
137137
+ * Copyright (c) 2019 BayLibre, SAS
@@ -339,21 +339,21 @@ index 00000000..53318e9d
339339
+
340340
+ sound {
341341
+ compatible = "amlogic,axg-sound-card";
342-
+ model = "CNIoT-CORE";
343-
+ audio-widgets = "Line", "Lineout";
344-
+ audio-aux-devs = <&tdmout_b>, <&tdmout_c>, <&ht6872>;
345-
+ audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
342+
+ model = "cainiao-cniot-core";
343+
+ audio-widgets = "Speaker", "Internal Speaker";
344+
+ audio-aux-devs = <&tdmout_a>, <&tdmout_b>, <&ht6872>;
345+
+ audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0",
346+
+ "TDMOUT_A IN 1", "FRDDR_B OUT 0",
347+
+ "TDMOUT_A IN 2", "FRDDR_C OUT 0",
348+
+ "TDM_A Playback", "TDMOUT_A OUT",
349+
+ "TDMOUT_B IN 0", "FRDDR_A OUT 1",
346350
+ "TDMOUT_B IN 1", "FRDDR_B OUT 1",
347351
+ "TDMOUT_B IN 2", "FRDDR_C OUT 1",
348352
+ "TDM_B Playback", "TDMOUT_B OUT",
349-
+ "TDMOUT_C IN 0", "FRDDR_A OUT 2",
350-
+ "TDMOUT_C IN 1", "FRDDR_B OUT 2",
351-
+ "TDMOUT_C IN 2", "FRDDR_C OUT 2",
352-
+ "TDM_C Playback", "TDMOUT_C OUT",
353353
+ "HT6872 INL", "ACODEC LOLP",
354354
+ "HT6872 INR", "ACODEC LORP",
355-
+ "Lineout", "HT6872 OUTL",
356-
+ "Lineout", "HT6872 OUTR";
355+
+ "Internal Speaker", "HT6872 OUTL",
356+
+ "Internal Speaker", "HT6872 OUTR";
357357
+
358358
+ clocks = <&clkc CLKID_MPLL2>,
359359
+ <&clkc CLKID_MPLL0>,
@@ -381,27 +381,39 @@ index 00000000..53318e9d
381381
+
382382
+ /* 8ch hdmi interface */
383383
+ dai-link-3 {
384-
+ sound-dai = <&tdmif_b>;
384+
+ sound-dai = <&tdmif_a>;
385385
+ dai-format = "i2s";
386386
+ dai-tdm-slot-tx-mask-0 = <1 1>;
387387
+ dai-tdm-slot-tx-mask-1 = <1 1>;
388388
+ dai-tdm-slot-tx-mask-2 = <1 1>;
389389
+ dai-tdm-slot-tx-mask-3 = <1 1>;
390390
+ mclk-fs = <256>;
391391
+
392-
+ codec {
393-
+ sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>;
392+
+ codec-0 {
393+
+ sound-dai = <&tohdmitx TOHDMITX_I2S_IN_A>;
394+
+ };
395+
+
396+
+ codec-1 {
397+
+ sound-dai = <&toacodec TOACODEC_IN_A>;
394398
+ };
395399
+ };
396400
+
401+
+ /* 8ch hdmi interface */
397402
+ dai-link-4 {
398-
+ sound-dai = <&tdmif_c>;
403+
+ sound-dai = <&tdmif_b>;
399404
+ dai-format = "i2s";
400405
+ dai-tdm-slot-tx-mask-0 = <1 1>;
406+
+ dai-tdm-slot-tx-mask-1 = <1 1>;
407+
+ dai-tdm-slot-tx-mask-2 = <1 1>;
408+
+ dai-tdm-slot-tx-mask-3 = <1 1>;
401409
+ mclk-fs = <256>;
402410
+
403-
+ codec {
404-
+ sound-dai = <&toacodec TOACODEC_IN_C>;
411+
+ codec-0 {
412+
+ sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>;
413+
+ };
414+
+
415+
+ codec-1 {
416+
+ sound-dai = <&toacodec TOACODEC_IN_B>;
405417
+ };
406418
+ };
407419
+
@@ -660,19 +672,19 @@ index 00000000..53318e9d
660672
+ };
661673
+};
662674
+
663-
+&tdmif_b {
675+
+&tdmif_a {
664676
+ status = "okay";
665677
+};
666678
+
667-
+&tdmif_c {
679+
+&tdmif_b {
668680
+ status = "okay";
669681
+};
670682
+
671-
+&tdmout_b {
683+
+&tdmout_a {
672684
+ status = "okay";
673685
+};
674686
+
675-
+&tdmout_c {
687+
+&tdmout_b {
676688
+ status = "okay";
677689
+};
678690
+

0 commit comments

Comments
 (0)