diff --git a/ac101.c b/ac101.c index 3a95203..bdc9882 100644 --- a/ac101.c +++ b/ac101.c @@ -782,8 +782,8 @@ static struct snd_kcontrol_new ac101_controls[] = { SOC_DOUBLE_TLV("DAC volume", DAC_VOL_CTRL, DAC_VOL_L, DAC_VOL_R, 0xff, 0, dac_vol_tlv), SOC_DOUBLE_TLV("DAC mixer gain", DAC_MXR_GAIN, DACL_MXR_GAIN, DACR_MXR_GAIN, 0xf, 0, dac_mix_vol_tlv), SOC_SINGLE_TLV("digital volume", DAC_DBG_CTRL, DVC, 0x3f, 1, dig_vol_tlv), - SOC_SINGLE_TLV("speaker volume", SPKOUT_CTRL, SPK_VOL, 0x1f, 0, speaker_vol_tlv), - SOC_SINGLE_TLV("headphone volume", HPOUT_CTRL, HP_VOL, 0x3f, 0, headphone_vol_tlv), + SOC_SINGLE_TLV("Speaker Playback Volume", SPKOUT_CTRL, SPK_VOL, 0x1f, 0, speaker_vol_tlv), + SOC_SINGLE_TLV("Headphone Playback Volume", HPOUT_CTRL, HP_VOL, 0x3f, 0, headphone_vol_tlv), }; /* PLL divisors */ diff --git a/ac108_6mic.state b/ac108_6mic.state index bdbe64a..61e691a 100644 --- a/ac108_6mic.state +++ b/ac108_6mic.state @@ -338,7 +338,7 @@ state.seeed8micvoicec { } control.20 { iface MIXER - name 'speaker volume' + name 'Speaker Playback Volume' value 25 comment { access 'read write' @@ -352,7 +352,7 @@ state.seeed8micvoicec { } control.21 { iface MIXER - name 'headphone volume' + name 'Headphone Playback Volume' value 52 comment { access 'read write' diff --git a/install.sh b/install.sh index 1d8370b..8c84be9 100755 --- a/install.sh +++ b/install.sh @@ -68,7 +68,7 @@ function get_kernel_version() { ZIMAGE=/boot/kernel.img [ -f /boot/firmware/vmlinuz ] && ZIMAGE=/boot/firmware/vmlinuz IMG_OFFSET=$(LC_ALL=C grep -abo $'\x1f\x8b\x08\x00' $ZIMAGE | head -n 1 | cut -d ':' -f 1) - _VER_RUN=$(dd if=$ZIMAGE obs=64K ibs=4 skip=$(( IMG_OFFSET / 4)) | zcat | grep -a -m1 "Linux version" | strings | awk '{ print $3; }') + _VER_RUN=$(dd if=$ZIMAGE obs=64K ibs=4 skip=$(( IMG_OFFSET / 4)) 2>/dev/null | zcat | grep -a -m1 "Linux version" | strings | awk '{ print $3; }') } echo "$_VER_RUN" return 0 diff --git a/uninstall.sh b/uninstall.sh index a00f7a1..adbebfc 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -69,6 +69,7 @@ echo "remove alsa configs" rm -rf /etc/voicecard/ || true echo "disabled seeed-voicecard.service " +systemctl stop seeed-voicecard.service systemctl disable seeed-voicecard.service echo "remove seeed-voicecard"