From 616ff663208e011e4ee5e2eeadb7cc0dd792df04 Mon Sep 17 00:00:00 2001 From: Lin Jianhua Date: Tue, 3 Jul 2018 17:07:47 +0800 Subject: [PATCH] arm: dts: rockchip: rk3308-voice-module: config vad Change-Id: I764b5fe657a503d4a0efd12920054932c8b61dcf Signed-off-by: Lin Jianhua --- .../rk3308-voice-module-board-v10-aarch32.dts | 9 +-------- ...08-voice-module-mainboard-v10-aarch32.dtsi | 9 +-------- .../dts/rk3308-voice-module-v10-aarch32.dtsi | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/arch/arm/boot/dts/rk3308-voice-module-board-v10-aarch32.dts b/arch/arm/boot/dts/rk3308-voice-module-board-v10-aarch32.dts index f80efd24bdbd..2efd960abf4b 100644 --- a/arch/arm/boot/dts/rk3308-voice-module-board-v10-aarch32.dts +++ b/arch/arm/boot/dts/rk3308-voice-module-board-v10-aarch32.dts @@ -24,14 +24,7 @@ &acodec { status = "okay"; - + rockchip,no-deep-low-power; /* ADC5-6 for 2ch capture, loopback to ADC3-4 */ rockchip,adc-grps-route = <2 1 3 0>; }; - -&vad { - status = "disabled"; - rockchip,audio-src = <&i2s_8ch_2>; - rockchip,mode = <1>; - #sound-dai-cells = <0>; -}; diff --git a/arch/arm/boot/dts/rk3308-voice-module-mainboard-v10-aarch32.dtsi b/arch/arm/boot/dts/rk3308-voice-module-mainboard-v10-aarch32.dtsi index 1953d3ff68d5..85e11b26617a 100644 --- a/arch/arm/boot/dts/rk3308-voice-module-mainboard-v10-aarch32.dtsi +++ b/arch/arm/boot/dts/rk3308-voice-module-mainboard-v10-aarch32.dtsi @@ -36,7 +36,7 @@ &acodec { status = "okay"; - + rockchip,no-deep-low-power; /* ADC3-6 for 4ch capture, loopback to ADC7 */ rockchip,adc-grps-route = <1 2 3 0>; }; @@ -402,10 +402,3 @@ pinctrl-0 = <&uart4_xfer &uart4_cts>; status = "okay"; }; - -&vad { - status = "disabled"; - rockchip,audio-src = <&i2s_8ch_2>; - rockchip,mode = <1>; - #sound-dai-cells = <0>; -}; diff --git a/arch/arm/boot/dts/rk3308-voice-module-v10-aarch32.dtsi b/arch/arm/boot/dts/rk3308-voice-module-v10-aarch32.dtsi index cfb74991e6e1..1a9fada7de48 100644 --- a/arch/arm/boot/dts/rk3308-voice-module-v10-aarch32.dtsi +++ b/arch/arm/boot/dts/rk3308-voice-module-v10-aarch32.dtsi @@ -94,6 +94,7 @@ rockchip,mclk-fs = <256>; rockchip,cpu = <&i2s_8ch_2>; rockchip,codec = <&acodec>; + status = "disabled"; }; spdif_tx_sound: spdif-tx-sound { @@ -108,6 +109,15 @@ }; }; + vad-sound { + status = "okay"; + compatible = "rockchip,multicodecs-card"; + rockchip,card-name = "rockchip,rk3308-vad"; + rockchip,codec-hp-det; + rockchip,cpu = <&i2s_8ch_2>; + rockchip,codec = <&acodec>, <&vad>; + }; + vdd_log: vdd_core: vdd-core { compatible = "pwm-regulator"; pwms = <&pwm0 0 5000 1>; @@ -320,3 +330,12 @@ &usb_host0_ohci{ status = "okay"; }; + +&vad { + status = "okay"; + rockchip,audio-src = <&i2s_8ch_2>; + rockchip,det-channel = <0>; + rockchip,mode = <1>; + rockchip,buffer-time-ms = <500>; + #sound-dai-cells = <0>; +};