|
11 | 11 | model = "Rockchip RK3308 evb digital-i2s mic v11 board"; |
12 | 12 | compatible = "rockchip,rk3308-evb-dmic-i2s-v11", "rockchip,rk3308"; |
13 | 13 |
|
14 | | - i2s-dmic-array { |
| 14 | + i2s_8ch_0_2_dais: i2s-8ch-0-2-dais { |
15 | 15 | status = "okay"; |
| 16 | + compatible = "rockchip,multi-dais"; |
| 17 | + dais = <&i2s_8ch_0>, <&i2s_8ch_2>; |
| 18 | + capture,channel-mapping = <6 2>; |
| 19 | + playback,channel-mapping = <0 2>; |
| 20 | + }; |
| 21 | + |
| 22 | + i2s-dmic-array { |
| 23 | + status = "disabled"; |
16 | 24 | compatible = "simple-audio-card"; |
17 | 25 | simple-audio-card,format = "i2s"; |
18 | 26 | simple-audio-card,name = "rockchip,i2s-dmic-array"; |
|
26 | 34 | }; |
27 | 35 |
|
28 | 36 | vad-sound { |
29 | | - status = "disabled"; |
| 37 | + status = "okay"; |
30 | 38 | compatible = "rockchip,multicodecs-card"; |
31 | 39 | rockchip,card-name = "rockchip,rk3308-vad"; |
32 | | - rockchip,cpu = <&i2s_8ch_0>; |
33 | | - rockchip,codec = <&dummy_codec>, <&vad>; |
| 40 | + rockchip,cpu = <&i2s_8ch_0_2_dais>; |
| 41 | + rockchip,codec = <&acodec>, <&vad>; |
34 | 42 | }; |
35 | 43 | }; |
36 | 44 |
|
| 45 | +&acodec_sound { |
| 46 | + status = "disabled"; |
| 47 | +}; |
| 48 | + |
37 | 49 | &dummy_codec { |
38 | | - status = "okay"; |
| 50 | + status = "disabled"; |
39 | 51 | #sound-dai-cells = <0>; |
40 | 52 | }; |
41 | 53 |
|
42 | 54 | &i2s_8ch_0 { |
43 | 55 | status = "okay"; |
| 56 | + rockchip,no-dmaengine; |
| 57 | + #sound-dai-cells = <0>; |
| 58 | +}; |
| 59 | + |
| 60 | +&i2s_8ch_2 { |
| 61 | + status = "okay"; |
| 62 | + rockchip,no-dmaengine; |
44 | 63 | #sound-dai-cells = <0>; |
45 | 64 | }; |
46 | 65 |
|
47 | 66 | &vad { |
48 | | - status = "disabled"; |
| 67 | + status = "okay"; |
49 | 68 | rockchip,audio-src = <&i2s_8ch_0>; |
| 69 | + rockchip,buffer-time-ms = <200>; |
50 | 70 | rockchip,det-channel = <0>; |
51 | 71 | rockchip,mode = <1>; |
52 | 72 | #sound-dai-cells = <0>; |
|
0 commit comments