zymon/seeed-voicecard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/v5.5' into v5.7

Browse source
This commit is contained in:
Hin-Tak Leung 2020-09-04 23:50:14 +01:00
commit bb1422182b
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
install.sh
View file

@ -80,6 +80,10 @@ function check_kernel_headers() {
[ "X$VER_RUN" == "X$VER_HDR" ] && { [ "X$VER_RUN" == "X$VER_HDR" ] && {
return 0 return 0
} }
VER_HDR=$(dpkg -L linux-headers-$VER_RUN | egrep -m1 "/lib/modules/[[:print:]]+/build" | awk -F'/' '{ print $4; }')
[ "X$VER_RUN" == "X$VER_HDR" ] && {
return 0
}
# echo RUN=$VER_RUN HDR=$VER_HDR # echo RUN=$VER_RUN HDR=$VER_HDR
echo " !!! Your kernel version is $VER_RUN" echo " !!! Your kernel version is $VER_RUN"
@ -100,7 +104,10 @@ function check_kernel_headers() {
which apt &>/dev/null which apt &>/dev/null
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then
apt update -y apt update -y
# Raspbian kernel packages
apt-get -y install raspberrypi-kernel-headers raspberrypi-kernel apt-get -y install raspberrypi-kernel-headers raspberrypi-kernel
# Ubuntu kernel packages
apt-get -y install linux-raspi linux-headers-raspi linux-image-raspi
apt-get -y install dkms git i2c-tools libasound2-plugins apt-get -y install dkms git i2c-tools libasound2-plugins
# rpi-update checker # rpi-update checker
check_kernel_headers check_kernel_headers

2
seeed-voicecard.c
View file

@ -457,6 +457,8 @@ static int seeed_voice_card_dai_link_of(struct device_node *node,
#else #else
ret = asoc_simple_parse_clk_codec(dev, codec, dai_link, codec_dai); ret = asoc_simple_parse_clk_codec(dev, codec, dai_link, codec_dai);
#endif #endif
if (!strncmp(dai_link->codecs->dai_name, "ac10", 4))
codec_dai->sysclk = 24000000;
if (ret < 0) if (ret < 0)
goto dai_link_of_err; goto dai_link_of_err;