github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

arm: dts: rockchip: rk3308-voice-module: config vad

Browse Source 
Change-Id: I764b5fe657a503d4a0efd12920054932c8b61dcf
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
This commit is contained in:
Lin Jianhua 2018-07-03 17:07:47 +08:00 committed by Tao Huang
parent ca3a31fb5d
commit 616ff66320
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/boot/dts/rk3308-voice-module-board-v10-aarch32.dts
View File

@ -24,14 +24,7 @@ wireless-wlan {
&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>;
};

9
arch/arm/boot/dts/rk3308-voice-module-mainboard-v10-aarch32.dtsi
View File

@ -36,7 +36,7 @@ wireless-wlan {
&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 @@ &uart4 {
pinctrl-0 = <&uart4_xfer &uart4_cts>;
status = "okay";
};
&vad {
status = "disabled";
rockchip,audio-src = <&i2s_8ch_2>;
rockchip,mode = <1>;
#sound-dai-cells = <0>;
};

19
arch/arm/boot/dts/rk3308-voice-module-v10-aarch32.dtsi
View File

@ -94,6 +94,7 @@ acodec_sound: acodec-sound {
rockchip,mclk-fs = <256>;
rockchip,cpu = <&i2s_8ch_2>;
rockchip,codec = <&acodec>;
status = "disabled";
};
spdif_tx_sound: spdif-tx-sound {
@ -108,6 +109,15 @@ simple-audio-card,codec {
};
};
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_ehci {
&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>;
};