Merge remote-tracking branch 'upstream/master' into v5.7

Conflicts:
	install.sh
This commit is contained in:
Hin-Tak Leung 2020-07-25 05:34:36 +01:00
commit 97fd3f2eab
2 changed files with 5 additions and 4 deletions

View file

@ -9,9 +9,10 @@ Get the seeed voice card source code. and install all linux kernel drivers
```bash ```bash
git clone https://github.com/respeaker/seeed-voicecard git clone https://github.com/respeaker/seeed-voicecard
cd seeed-voicecard cd seeed-voicecard
sudo ./install.sh sudo ./install.sh
sudo reboot sudo reboot
``` ```
It may probably happen that the driver won't compile with the latest kernel when raspbian rolls out new patches to the kernel. If so, please try `sudo ./install.sh --compat-kernel` which uses an older kernel but ensures that the driver can work.
## ReSpeaker Mic Hat ## ReSpeaker Mic Hat

View file

@ -73,9 +73,9 @@ echo "remove dkms"
rm -rf /var/lib/dkms/seeed-voicecard || true rm -rf /var/lib/dkms/seeed-voicecard || true
echo "remove kernel modules" echo "remove kernel modules"
rm /lib/modules/${uname_r}/kernel/sound/soc/codecs/snd-soc-wm8960.ko || true rm /lib/modules/*/kernel/sound/soc/codecs/snd-soc-wm8960.ko || true
rm /lib/modules/${uname_r}/kernel/sound/soc/codecs/snd-soc-ac108.ko || true rm /lib/modules/*/kernel/sound/soc/codecs/snd-soc-ac108.ko || true
rm /lib/modules/${uname_r}/kernel/sound/soc/bcm/snd-soc-seeed-voicecard.ko || true rm /lib/modules/*/kernel/sound/soc/bcm/snd-soc-seeed-voicecard.ko || true
echo "remove $CONFIG configuration" echo "remove $CONFIG configuration"
for i in $RPI_HATS; do for i in $RPI_HATS; do