Skip to content

Commit 9d7f95c

Browse files
Sugar Zhangrkhuangtao
Sugar Zhang
authored and
rkhuangtao
committed
arm64: dts: rockchip: rk3308-evb-*.dts: update for vad
Change-Id: I31f38d170324397f818fc7b7ec3946e88d80d7bf Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
1 parent 76d3a9a commit 9d7f95c

6 files changed

Lines changed: 64 additions & 21 deletions

File tree

‎arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v10.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
&vad {
3131
status = "disabled";
32-
rockchip,audio-src = <2>;
32+
rockchip,audio-src = <&i2s_8ch_2>;
3333
rockchip,mode = <1>;
3434
#sound-dai-cells = <0>;
3535
};

‎arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v11.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
&vad {
3030
status = "disabled";
31-
rockchip,audio-src = <2>;
31+
rockchip,audio-src = <&i2s_8ch_2>;
3232
rockchip,mode = <1>;
3333
#sound-dai-cells = <0>;
3434
};

‎arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v10.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
&vad {
4949
status = "disabled";
50-
rockchip,audio-src = <0>;
50+
rockchip,audio-src = <&i2s_8ch_0>;
5151
rockchip,det-channel = <0>;
5252
rockchip,mode = <1>;
5353
#sound-dai-cells = <0>;

‎arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v11.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
&vad {
4848
status = "disabled";
49-
rockchip,audio-src = <0>;
49+
rockchip,audio-src = <&i2s_8ch_0>;
5050
rockchip,det-channel = <0>;
5151
rockchip,mode = <1>;
5252
#sound-dai-cells = <0>;

‎arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v10.dts‎

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,16 @@
1212
model = "Rockchip RK3308 evb digital-pdm mic board";
1313
compatible = "rockchip,rk3308-evb-dmic-pdm-v10", "rockchip,rk3308";
1414

15-
pdm-mic-array {
15+
pdm_i2s_dais: pdm-i2s-dais {
1616
status = "okay";
17+
compatible = "rockchip,multi-dais";
18+
dais = <&pdm_8ch>, <&i2s_8ch_2>;
19+
capture,channel-mapping = <6 2>;
20+
playback,channel-mapping = <0 0>;
21+
};
22+
23+
pdm-mic-array {
24+
status = "disabled";
1725
compatible = "simple-audio-card";
1826
simple-audio-card,name = "rockchip,pdm-mic-array";
1927
simple-audio-card,cpu {
@@ -25,26 +33,27 @@
2533
};
2634

2735
vad-sound {
28-
status = "disabled";
36+
status = "okay";
2937
compatible = "rockchip,multicodecs-card";
3038
rockchip,card-name = "rockchip,rk3308-vad";
31-
rockchip,cpu = <&pdm_8ch>;
32-
rockchip,codec = <&dummy_codec>, <&vad>;
39+
rockchip,cpu = <&pdm_i2s_dais>;
40+
rockchip,codec = <&acodec>, <&vad>;
3341
};
3442
};
3543

3644
&acodec_sound {
37-
status = "okay";
45+
status = "disabled";
3846
};
3947

4048
&dummy_codec {
41-
status = "okay";
49+
status = "disabled";
4250
#sound-dai-cells = <0>;
4351
};
4452

4553
&pdm_8ch {
4654
status = "okay";
4755
#sound-dai-cells = <0>;
56+
rockchip,no-dmaengine;
4857
pinctrl-names = "default";
4958
pinctrl-0 = <&pdm_m2_clk
5059
&pdm_m2_clkm
@@ -55,9 +64,21 @@
5564
};
5665

5766
&vad {
58-
status = "disabled";
59-
rockchip,audio-src = <4>;
67+
status = "okay";
68+
rockchip,audio-src = <&pdm_8ch>;
69+
rockchip,buffer-time-ms = <200>;
6070
rockchip,det-channel = <2>;
6171
rockchip,mode = <1>;
6272
#sound-dai-cells = <0>;
6373
};
74+
75+
&pdm_i2s_dais {
76+
status = "okay";
77+
#sound-dai-cells = <0>;
78+
};
79+
80+
&i2s_8ch_2 {
81+
status = "okay";
82+
rockchip,no-dmaengine;
83+
#sound-dai-cells = <0>;
84+
};

‎arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v11.dts‎

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,17 @@
1111
model = "Rockchip RK3308 evb digital-pdm mic v11 board";
1212
compatible = "rockchip,rk3308-evb-dmic-pdm-v11", "rockchip,rk3308";
1313

14-
pdm-mic-array {
14+
pdm_i2s_dais: pdm-i2s-dais {
1515
status = "okay";
16+
compatible = "rockchip,multi-dais";
17+
dais = <&pdm_8ch>, <&i2s_8ch_2>;
18+
capture,channel-mapping = <6 2>;
19+
playback,channel-mapping = <0 0>;
20+
bitclock-inversion = <1 0>;
21+
};
22+
23+
pdm-mic-array {
24+
status = "disabled";
1625
compatible = "simple-audio-card";
1726
simple-audio-card,name = "rockchip,pdm-mic-array";
1827
simple-audio-card,cpu {
@@ -24,26 +33,27 @@
2433
};
2534

2635
vad-sound {
27-
status = "disabled";
36+
status = "okay";
2837
compatible = "rockchip,multicodecs-card";
2938
rockchip,card-name = "rockchip,rk3308-vad";
30-
rockchip,cpu = <&pdm_8ch>;
31-
rockchip,codec = <&dummy_codec>, <&vad>;
39+
rockchip,cpu = <&pdm_i2s_dais>;
40+
rockchip,codec = <&acodec>, <&vad>;
3241
};
3342
};
3443

3544
&acodec_sound {
36-
status = "okay";
45+
status = "disabled";
3746
};
3847

3948
&dummy_codec {
40-
status = "okay";
49+
status = "disabled";
4150
#sound-dai-cells = <0>;
4251
};
4352

4453
&pdm_8ch {
4554
status = "okay";
4655
#sound-dai-cells = <0>;
56+
rockchip,no-dmaengine;
4757
pinctrl-names = "default";
4858
pinctrl-0 = <&pdm_m2_clk
4959
&pdm_m2_clkm
@@ -54,9 +64,21 @@
5464
};
5565

5666
&vad {
57-
status = "disabled";
58-
rockchip,audio-src = <4>;
59-
rockchip,det-channel = <2>;
67+
status = "okay";
68+
rockchip,audio-src = <&pdm_8ch>;
69+
rockchip,det-channel = <0>;
6070
rockchip,mode = <1>;
71+
rockchip,buffer-time-ms = <200>;
72+
#sound-dai-cells = <0>;
73+
};
74+
75+
&i2s_8ch_2 {
76+
status = "okay";
77+
rockchip,no-dmaengine;
78+
#sound-dai-cells = <0>;
79+
};
80+
81+
&pdm_i2s_dais {
82+
status = "okay";
6183
#sound-dai-cells = <0>;
6284
};

0 commit comments

Comments
 (0)