codecs/rt5672: Move +12dB input boost from 'STO1 ADC Boost Gain' to 'ADC Capture...

Both the 'STO1 ADC Boost Gain' and the 'ADC Capture Volume' controls are
digital and the 'ADC Capture Volume' control goes up to +30dB.

When adding hw-volume-control support adding the +12dB boost gain on to of
the max +30dB of 'ADC Capture Volume' is a bit too much.

So move the +12dB from the 'STO1 ADC Boost Gain' control to the
'ADC Capture Volume' control.

This way we keep the same setting for userspace which does not support
hw-volume-control, while getting a better range when we start using
'ADC Capture Volume' as hw-volume-control.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/codecs/rt5672/EnableSeq.conf b/ucm2/codecs/rt5672/EnableSeq.conf
index ddfb1c7b6c720409fb3b8932e790867a5e8bd016..e3732750dfc144ef28ce58675d3398dba5c8bbbe 100644 (file)
--- a/ucm2/codecs/rt5672/EnableSeq.conf
+++ b/ucm2/codecs/rt5672/EnableSeq.conf
@@ -26,14 +26,13 @@ EnableSequence [
        # cset "name='LOUT MIX OUTMIX L Switch' on"
        # cset "name='LOUT MIX OUTMIX R Switch' on"
 
-       # 47=0dB, 0.375 dB/step
-       cset "name='ADC Capture Volume' 47"
+       # Both the DMICs and the headset mic (even with the 20dB boost below)
+       # are quite soft, set the default capture volume to +12dB
+       # 47=0dB, 0.375dB/step, 79=+12dB
+       cset "name='ADC Capture Volume' 79"
        cset "name='ADC Capture Switch' on"
-
-       # Both the DMICs and the headset mic (even with the 20 dB boost below)
-       # are quite soft, set the ADC Boost gain (range 0-3) to 1 = 12 dB the
-       # next step is 24 dB which is a bit too much
-       cset "name='STO1 ADC Boost Gain Volume' 1"
+       # 0=0dB
+       cset "name='STO1 ADC Boost Gain Volume' 0"
 
        # Headset mic is quite soft, boost it a bit, 1 = 20dB which is the first
        # available boost step