|
发表于 2020-11-9 10:53:05
/ # ls -l /dev/snd
ls -l /dev/snd
total 0
drwxr-xr-x 2 root root 80 Dec 31 19:00 by-path
crw-rw---- 1 root audio 116, 0 Dec 31 19:00 controlC0
crw-rw---- 1 root audio 116, 224 Dec 31 19:00 controlC7
crw-rw---- 1 root audio 116, 24 Dec 31 19:00 pcmC0D0c
crw-rw---- 1 root audio 116, 16 Dec 31 19:00 pcmC0D0p
crw-rw---- 1 root audio 116, 248 Dec 31 19:00 pcmC7D0c
crw-rw---- 1 root audio 116, 240 Dec 31 19:00 pcmC7D0p
crw-rw---- 1 root audio 116, 249 Dec 31 19:00 pcmC7D1c
crw-rw---- 1 root audio 116, 241 Dec 31 19:00 pcmC7D1p
crw-rw---- 1 root audio 116, 33 Dec 31 19:00 timer
/ # cat /proc/asound/cards
cat /proc/asound/cards
0 [rockchipi2s18ch]: rockchip_i2s1_8 - rockchip,i2s1_8ch_mic
rockchip,i2s1_8ch_mic
7 [Loopback ]: Loopback - Loopback
Loopback 1
/ #
diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3308-roc-cc-dmic-pdm_emmc.dts b/kernel/arch/arm64/boot/dts/rockchip/rk3308-roc-cc-dmic-pdm_emmc.dts
old mode 100644
new mode 100755
index b996358..8ad36d8
--- a/kernel/arch/arm64/boot/dts/rockchip/rk3308-roc-cc-dmic-pdm_emmc.dts
+++ b/kernel/arch/arm64/boot/dts/rockchip/rk3308-roc-cc-dmic-pdm_emmc.dts
@@ -32,9 +32,23 @@
sound-dai = <&dummy_codec>;
};
};
-
- vad-sound {
+ i2s1-8ch-sound {
status = "okay";
+ compatible = "simple-audio-card";
+ simple-audio-card,format = "i2s";
+ simple-audio-card,name = "rockchip,i2s1_8ch_mic";
+ simple-audio-card,mclk-fs = <256>;
+ simple-audio-card,cpu {
+ sound-dai = <&i2s_8ch_1>;
+ dai-tdm-slot-num = <4>;
+ dai-tdm-slot-width = <32>;
+ };
+ simple-audio-card,codec {
+ sound-dai = <&dummy_codec>;
+ };
+ };
+ vad-sound {
+ status = "disabled";
compatible = "rockchip,multicodecs-card";
rockchip,card-name = "rockchip,rk3308-vad";
rockchip,cpu = <&pdm_i2s_dais>;
@@ -73,6 +87,19 @@
rockchip,clk-trcm = <1>;
};
+&i2s_8ch_1 {
+ status = "okay";
+ #sound-dai-cells = <0>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2s_8ch_1_m0_sclktx
+ &i2s_8ch_1_m0_sclkrx
+ &i2s_8ch_1_m0_lrcktx
+ &i2s_8ch_1_m0_lrckrx
+ &i2s_8ch_1_m0_sdi0
+ &i2s_8ch_1_m0_sdo0
+ &i2s_8ch_1_m0_mclk>;
+};
+
&pdm_8ch {
status = "okay";
#sound-dai-cells = <0>;
diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/kernel/arch/arm64/boot/dts/rockchip/rk3308.dtsi
old mode 100644
new mode 100755
index 194642a..cba6f99
--- a/kernel/arch/arm64/boot/dts/rockchip/rk3308.dtsi
+++ b/kernel/arch/arm64/boot/dts/rockchip/rk3308.dtsi
@@ -835,6 +835,7 @@
resets = <&cru SRST_I2S1_8CH_TX_M>, <&cru SRST_I2S1_8CH_RX_M>;
reset-names = "tx-m", "rx-m";
rockchip,cru = <&cru>;
+ rockchip,grf = <&grf>;
rockchip,mclk-calibrate;
status = "disabled";
};
|
|