From 8f40348165511dac626c4228b1d883a06ccc3945 Mon Sep 17 00:00:00 2001 From: wangzijiao Date: Thu, 29 Nov 2018 17:10:45 +0800 Subject: [PATCH] modify driver for mic capture --- .../arm/boot/dts/sun8iw15p1-mandolin-pv1c.dts | 44 +++++++++++++++++++ target/allwinner/mandolin-pv1c/config-4.9 | 6 +-- .../mandolin-pv1c/configs/sys_config.fex | 10 ++--- 3 files changed, 51 insertions(+), 9 deletions(-) create mode 100644 lichee/linux-4.9/arch/arm/boot/dts/sun8iw15p1-mandolin-pv1c.dts diff --git a/lichee/linux-4.9/arch/arm/boot/dts/sun8iw15p1-mandolin-pv1c.dts b/lichee/linux-4.9/arch/arm/boot/dts/sun8iw15p1-mandolin-pv1c.dts new file mode 100644 index 000000000..b4e39ee51 --- /dev/null +++ b/lichee/linux-4.9/arch/arm/boot/dts/sun8iw15p1-mandolin-pv1c.dts @@ -0,0 +1,44 @@ +/* + * Allwinner Technology CO., Ltd. sun8iw12p1 fpga board. + * + * fpga board support. + */ + +/dts-v1/; + +#include "sun8iw15p1.dtsi" + +/{ + soc@03000000 { + snddaudio0:sound@1{ + sunxi,snddaudio-codec = "netease1.mic.codec"; + sunxi,snddaudio-codec-dai = "netease1.mic.codecdai"; + }; + + wlan:wlan { + compatible = "allwinner,sunxi-wlan"; + clocks = <&clk_losc_out>; + wlan_power = "vcc-wifi"; + wlan_io_regulator = "vcc-wifi-io"; + wlan_busnum = <1>; + wlan_regon = <&r_pio PL 5 1 1 1 0>; + wlan_hostwake = <&r_pio PL 6 6 0 0 0>; + status = "okay"; + }; + bt:bt { + compatible = "allwinner,sunxi-bt"; + clocks = <&clk_losc_out>; + bt_power = "vcc-wifi"; + bt_io_regulator = "vcc-wifi-io"; + bt_rst_n = <&r_pio PL 2 1 1 1 0>; + status = "okay"; + }; + btlpm:btlpm { + compatible = "allwinner,sunxi-btlpm"; + uart_index = <1>; + bt_wake = <&r_pio PL 7 1 1 1 1>; + bt_hostwake = <&r_pio PL 4 6 0 0 0>; + status = "okay"; + }; + }; +}; diff --git a/target/allwinner/mandolin-pv1c/config-4.9 b/target/allwinner/mandolin-pv1c/config-4.9 index 405733c78..6721ce823 100644 --- a/target/allwinner/mandolin-pv1c/config-4.9 +++ b/target/allwinner/mandolin-pv1c/config-4.9 @@ -793,8 +793,7 @@ CONFIG_SND_SOC_AD82584F=y # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L33 is not set # CONFIG_SND_SOC_CS53L30 is not set -CONFIG_SND_SOC_DMIC=y -CONFIG_SND_SOC_ES7243=y +# CONFIG_SND_SOC_ES7243 is not set CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_IMG is not set @@ -815,12 +814,11 @@ CONFIG_SND_SPI=y CONFIG_SND_SUN8IW15_CODEC=y CONFIG_SND_SUNXI_SOC=y CONFIG_SND_SUNXI_SOC_DAUDIO=y -CONFIG_SND_SUNXI_SOC_DMIC=y CONFIG_SND_SUNXI_SOC_INTER_I2S=y CONFIG_SND_SUNXI_SOC_RWFUNC=y CONFIG_SND_SUNXI_SOC_SUN8IW15_CODEC=y CONFIG_SND_SUNXI_SOC_SUNXI_DAUDIO=y -CONFIG_SND_SUNXI_SOC_SUNXI_DMIC=y +# CONFIG_SND_SUNXI_SOC_SUNXI_DMIC is not set CONFIG_SND_SUPPORT_OLD_API=y CONFIG_SND_TIMER=y CONFIG_SND_USB_AUDIO=y diff --git a/target/allwinner/mandolin-pv1c/configs/sys_config.fex b/target/allwinner/mandolin-pv1c/configs/sys_config.fex index 9de130851..30c3cf1e3 100755 --- a/target/allwinner/mandolin-pv1c/configs/sys_config.fex +++ b/target/allwinner/mandolin-pv1c/configs/sys_config.fex @@ -1214,10 +1214,10 @@ bt_rst = ; if register the sound card dmic. ;--------------------------------------------------------------------------------- [dmic] -dmic_used = 1 +dmic_used = 0 [snddmic] -snddmic_used = 1 +snddmic_used = 0 ;-------------------------------------------------------------------------------- ;allwinner,pcm_lrck_period :16/32/64/128/256 @@ -1248,8 +1248,8 @@ snddmic_used = 1 ;-------------------------------------------------------------------------------- [snddaudio0] snddaudio0_used = 1 -sunxi,snddaudio-codec = "es7243.0-0013" -sunxi,snddaudio-codec-dai = "es7243" +;sunxi,snddaudio-codec = "es7243.0-0013" +;sunxi,snddaudio-codec-dai = "es7243" ;----------------------------------------------------------------------------- [daudio0] @@ -1262,7 +1262,7 @@ audio_format = 3 signal_inversion = 1 pcm_lrck_period = 32 msb_lsb_first = 0 -slot_width_select = 32 +slot_width_select = 24 frametype = 0 ;tx_data_mode = 1 ;rx_data_mode = 1