shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

arm64: dts: rockchip: rk3308-evb-*.dts: update for vad

Browse Source 
Change-Id: I31f38d170324397f818fc7b7ec3946e88d80d7bf
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
This commit is contained in:
Sugar Zhang
2018-06-07 01:09:27 +08:00
committed by Tao Huang
parent 76d3a9a031
commit 9d7f95ceee
6 changed files with 64 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v10.dts
View File

@@ -29,7 +29,7 @@
&vad {
status = "disabled";
rockchip,audio-src = <2>;
rockchip,audio-src = <&i2s_8ch_2>;
rockchip,mode = <1>;
#sound-dai-cells = <0>;
};

2
arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v11.dts
View File

@@ -28,7 +28,7 @@
&vad {
status = "disabled";
rockchip,audio-src = <2>;
rockchip,audio-src = <&i2s_8ch_2>;
rockchip,mode = <1>;
#sound-dai-cells = <0>;
};

2
arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v10.dts
View File

@@ -47,7 +47,7 @@
&vad {
status = "disabled";
rockchip,audio-src = <0>;
rockchip,audio-src = <&i2s_8ch_0>;
rockchip,det-channel = <0>;
rockchip,mode = <1>;
#sound-dai-cells = <0>;

2
arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-i2s-v11.dts
View File

@@ -46,7 +46,7 @@
&vad {
status = "disabled";
rockchip,audio-src = <0>;
rockchip,audio-src = <&i2s_8ch_0>;
rockchip,det-channel = <0>;
rockchip,mode = <1>;
#sound-dai-cells = <0>;

37
arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v10.dts
View File

@@ -12,8 +12,16 @@
model = "Rockchip RK3308 evb digital-pdm mic board";
compatible = "rockchip,rk3308-evb-dmic-pdm-v10", "rockchip,rk3308";
pdm-mic-array {
pdm_i2s_dais: pdm-i2s-dais {
status = "okay";
compatible = "rockchip,multi-dais";
dais = <&pdm_8ch>, <&i2s_8ch_2>;
capture,channel-mapping = <6 2>;
playback,channel-mapping = <0 0>;
};
pdm-mic-array {
status = "disabled";
compatible = "simple-audio-card";
simple-audio-card,name = "rockchip,pdm-mic-array";
simple-audio-card,cpu {
@@ -25,26 +33,27 @@
};
vad-sound {
status = "disabled";
status = "okay";
compatible = "rockchip,multicodecs-card";
rockchip,card-name = "rockchip,rk3308-vad";
rockchip,cpu = <&pdm_8ch>;
rockchip,codec = <&dummy_codec>, <&vad>;
rockchip,cpu = <&pdm_i2s_dais>;
rockchip,codec = <&acodec>, <&vad>;
};
};
&acodec_sound {
status = "okay";
status = "disabled";
};
&dummy_codec {
status = "okay";
status = "disabled";
#sound-dai-cells = <0>;
};
&pdm_8ch {
status = "okay";
#sound-dai-cells = <0>;
rockchip,no-dmaengine;
pinctrl-names = "default";
pinctrl-0 = <&pdm_m2_clk
&pdm_m2_clkm
@@ -55,9 +64,21 @@
};
&vad {
status = "disabled";
rockchip,audio-src = <4>;
status = "okay";
rockchip,audio-src = <&pdm_8ch>;
rockchip,buffer-time-ms = <200>;
rockchip,det-channel = <2>;
rockchip,mode = <1>;
#sound-dai-cells = <0>;
};
&pdm_i2s_dais {
status = "okay";
#sound-dai-cells = <0>;
};
&i2s_8ch_2 {
status = "okay";
rockchip,no-dmaengine;
#sound-dai-cells = <0>;
};

40
arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v11.dts
View File

@@ -11,8 +11,17 @@
model = "Rockchip RK3308 evb digital-pdm mic v11 board";
compatible = "rockchip,rk3308-evb-dmic-pdm-v11", "rockchip,rk3308";
pdm-mic-array {
pdm_i2s_dais: pdm-i2s-dais {
status = "okay";
compatible = "rockchip,multi-dais";
dais = <&pdm_8ch>, <&i2s_8ch_2>;
capture,channel-mapping = <6 2>;
playback,channel-mapping = <0 0>;
bitclock-inversion = <1 0>;
};
pdm-mic-array {
status = "disabled";
compatible = "simple-audio-card";
simple-audio-card,name = "rockchip,pdm-mic-array";
simple-audio-card,cpu {
@@ -24,26 +33,27 @@
};
vad-sound {
status = "disabled";
status = "okay";
compatible = "rockchip,multicodecs-card";
rockchip,card-name = "rockchip,rk3308-vad";
rockchip,cpu = <&pdm_8ch>;
rockchip,codec = <&dummy_codec>, <&vad>;
rockchip,cpu = <&pdm_i2s_dais>;
rockchip,codec = <&acodec>, <&vad>;
};
};
&acodec_sound {
status = "okay";
status = "disabled";
};
&dummy_codec {
status = "okay";
status = "disabled";
#sound-dai-cells = <0>;
};
&pdm_8ch {
status = "okay";
#sound-dai-cells = <0>;
rockchip,no-dmaengine;
pinctrl-names = "default";
pinctrl-0 = <&pdm_m2_clk
&pdm_m2_clkm
@@ -54,9 +64,21 @@
};
&vad {
status = "disabled";
rockchip,audio-src = <4>;
rockchip,det-channel = <2>;
status = "okay";
rockchip,audio-src = <&pdm_8ch>;
rockchip,det-channel = <0>;
rockchip,mode = <1>;
rockchip,buffer-time-ms = <200>;
#sound-dai-cells = <0>;
};
&i2s_8ch_2 {
status = "okay";
rockchip,no-dmaengine;
#sound-dai-cells = <0>;
};
&pdm_i2s_dais {
status = "okay";
#sound-dai-cells = <0>;
};