Skip to content

Commit ebb3e2c

Browse files
Yaojen_Changjamess-huang
authored andcommitted
Support seeed-2mic-voicecard by using dts overlay file
Also modify the seeed voicecard's drivers files' path. Change-Id: I7e49fdbfe909ca23d4b20289a4cd502870ba4680 Reviewed-on: https://tp-biosrd-v02/gerrit/83693 Reviewed-by: Jamess Huang(黃以民) <Jamess_Huang@asus.com> Tested-by: Jamess Huang(黃以民) <Jamess_Huang@asus.com>
1 parent 3dba983 commit ebb3e2c

17 files changed

Lines changed: 698 additions & 955 deletions

File tree

arch/arm/boot/dts/overlays/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
1212
iqaudio-digi-wm8804-audio.dtbo \
1313
justboom-dac.dtbo \
1414
justboom-digi.dtbo \
15+
seeed-2mic-voicecard.dtbo \
1516
waveshare35a-tinker.dtbo \
1617
waveshare32b-tinker.dtbo \
1718
pps-gpio.dtbo \
Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
/dts-v1/;
2+
/plugin/;
3+
4+
/ {
5+
compatible = "rockchip,rk3288";
6+
7+
fragment@0 {
8+
target-path ="/sound-simple-card";
9+
__overlay__ {
10+
status = "disabled";
11+
};
12+
};
13+
14+
fragment@1 {
15+
target-path="/";
16+
__overlay__ {
17+
wm8960_mclk: wm8960_mclk {
18+
compatible = "fixed-clock";
19+
#clock-cells = <0>;
20+
clock-frequency = <12288000>;
21+
};
22+
};
23+
};
24+
25+
fragment@2 {
26+
target = <&i2c1>;
27+
__overlay__ {
28+
#address-cells = <1>;
29+
#size-cells = <0>;
30+
status = "okay";
31+
32+
wm8960: wm8960 {
33+
compatible = "wlf,wm8960";
34+
reg = <0x1a>;
35+
#sound-dai-cells = <0>;
36+
AVDD-supply = <&vcc_sys>;
37+
DVDD-supply = <&vdd_3v3_reg>;
38+
};
39+
};
40+
};
41+
42+
fragment@3 {
43+
target-path = "/sound-ext-card";
44+
slave_overlay: __overlay__ {
45+
compatible = "simple-audio-card";
46+
simple-audio-card,format = "i2s";
47+
simple-audio-card,name = "seeed-2mic-voicecard";
48+
status = "okay";
49+
simple-audio-card,widgets =
50+
"Microphone", "Mic Jack",
51+
"Line", "Line In",
52+
"Line", "Line Out",
53+
"Speaker", "Speaker",
54+
"Headphone", "Headphone Jack";
55+
simple-audio-card,routing =
56+
"Headphone Jack", "HP_L",
57+
"Headphone Jack", "HP_R",
58+
"Speaker", "SPK_LP",
59+
"Speaker", "SPK_LN",
60+
"LINPUT1", "Mic Jack",
61+
"LINPUT3", "Mic Jack",
62+
"RINPUT1", "Mic Jack",
63+
"RINPUT2", "Mic Jack";
64+
65+
simple-audio-card,cpu {
66+
sound-dai = <&i2s>;
67+
};
68+
69+
dailink0_slave: simple-audio-card,codec {
70+
sound-dai = <&wm8960>;
71+
clocks = <&wm8960_mclk>;
72+
clock-names = "mclk";
73+
};
74+
};
75+
};
76+
77+
fragment@4 {
78+
target = <&hdmi>;
79+
__overlay__ {
80+
hdmi-i2s-audio-disable;
81+
};
82+
};
83+
84+
__overrides__ {
85+
alsaname = <&slave_overlay>,"simple-audio-card,name";
86+
compatible = <&wm8960>,"compatible";
87+
master = <0>,"=2!3";
88+
};
89+
90+
};

arch/arm/configs/miniarm-rk3288_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -615,6 +615,7 @@ CONFIG_SND_SOC_ROCKCHIP_RT5645=y
615615
CONFIG_SND_SOC_CX20810=y
616616
CONFIG_SND_SOC_RT5616=y
617617
CONFIG_SND_SOC_RT5640=y
618+
CONFIG_SND_SOC_SEEEDVOICEHAT_CARD=y
618619
CONFIG_SND_SOC_SPDIF=y
619620
CONFIG_SND_SIMPLE_CARD=y
620621
CONFIG_SND_ALOOP=m

drivers/misc/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,3 @@ obj-$(CONFIG_UID_SYS_STATS) += uid_sys_stats.o
6464
obj-$(CONFIG_MEMORY_STATE_TIME) += memory_state_time.o
6565
obj-$(CONFIG_USB_CAM_GPIO) += usb_cam_gpio.o
6666
obj-$(CONFIG_TINKER_MCU) += tinker_mcu.o
67-
obj-y += voice_card/

drivers/misc/voice_card/Makefile

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)