diff options
| author | Sugar Zhang <sugar.zhang@rock-chips.com> | 2018-06-07 01:09:27 +0800 |
|---|---|---|
| committer | Tao Huang <huangtao@rock-chips.com> | 2018-06-08 14:38:07 +0800 |
| commit | 9d7f95ceee37c81a6e56d2907cd203904d5e8080 (patch) | |
| tree | 70d9e1b76a218b99a51544513c0f9b3fd0aafa5a /arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v10.dts | |
| parent | 76d3a9a0314283653ac564d588103e4edfa7d479 (diff) | |
arm64: dts: rockchip: rk3308-evb-*.dts: update for vad
Change-Id: I31f38d170324397f818fc7b7ec3946e88d80d7bf
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Diffstat (limited to 'arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v10.dts')
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v10.dts | 37 |
1 files changed, 29 insertions, 8 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v10.dts index 23013b9cd6fc..497087c71400 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-dmic-pdm-v10.dts @@ -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>; +}; |