conf/ucm: chtrt5645: Microphone recording fixes

Apply microphone recording changes from:
https://github.com/plbossart/UCM.git

Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
[hdegoede@redhat.com: Drop non generic DMIC changes]
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/src/conf/ucm/chtrt5645/HiFi.conf b/src/conf/ucm/chtrt5645/HiFi.conf
index f63392d..b97a9c0 100644 (file)
--- a/src/conf/ucm/chtrt5645/HiFi.conf
+++ b/src/conf/ucm/chtrt5645/HiFi.conf
@@ -4,8 +4,8 @@ SectionVerb {
                TQ "HiFi"
 
                # ALSA PCM device for HiFi
-               PlaybackPCM "hw:chtrt5645,0"
-               CapturePCM "hw:chtrt5645,0"
+               PlaybackPCM "hw:chtrt5645"
+               CapturePCM "hw:chtrt5645"
        }
 
        EnableSequence [
@@ -255,7 +255,7 @@ SectionDevice."Headphones" {
 }
 
 SectionDevice."Mic".0 {
-       Comment "Internal Microphone"
+       Comment "Internal Analog Microphones"
 
        Value {
                CaptureChannels "2"
@@ -266,15 +266,33 @@ SectionDevice."Mic".0 {
                cdev "hw:chtrt5645"
 
                cset "name='Int Mic Switch' on"
-               cset "name='Sto1 ADC MIXL ADC2 Switch' on"
-               cset "name='Sto1 ADC MIXR ADC2 Switch' on"
+
+               cset "name='Sto1 ADC MIXL ADC1 Switch' on"
+               cset "name='Sto1 ADC MIXR ADC1 Switch' on"
+               cset "name='Sto1 ADC MIXL ADC2 Switch' off"
+               cset "name='Sto1 ADC MIXR ADC2 Switch' off"
+
+               cset "name='Mono ADC MIXL ADC1 Switch' on"
+               cset "name='Mono ADC MIXR ADC1 Switch' on"
+               cset "name='Mono ADC MIXL ADC2 Switch' off"
+               cset "name='Mono ADC MIXR ADC2 Switch' off"
+
+               cset "name='RECMIXL BST1 Switch' on"
+               cset "name='RECMIXR BST1 Switch' on"
+
        ]
 
        DisableSequence [
                cdev "hw:chtrt5645"
 
-               cset "name='Sto1 ADC MIXL ADC2 Switch' off"
-               cset "name='Sto1 ADC MIXR ADC2 Switch' off"
+               cset "name='Sto1 ADC MIXL ADC1 Switch' off"
+               cset "name='Sto1 ADC MIXR ADC1 Switch' off"
+               cset "name='Mono ADC MIXL ADC1 Switch' off"
+               cset "name='Mono ADC MIXR ADC1 Switch' off"
+
+               cset "name='RECMIXL BST1 Switch' off"
+               cset "name='RECMIXR BST1 Switch' off"
+
                cset "name='Int Mic Switch' off"
        ]
 }
@@ -292,19 +310,33 @@ SectionDevice."HSMic".0 {
                cdev "hw:chtrt5645"
 
                cset "name='Headset Mic Switch' on"
-               cset "name='RECMIXL BST1 Switch' on"
-               cset "name='RECMIXR BST1 Switch' on"
+
                cset "name='Sto1 ADC MIXL ADC1 Switch' on"
                cset "name='Sto1 ADC MIXR ADC1 Switch' on"
+               cset "name='Sto1 ADC MIXL ADC2 Switch' off"
+               cset "name='Sto1 ADC MIXR ADC2 Switch' off"
+
+               cset "name='Mono ADC MIXL ADC1 Switch' on"
+               cset "name='Mono ADC MIXR ADC1 Switch' on"
+               cset "name='Mono ADC MIXL ADC2 Switch' off"
+               cset "name='Mono ADC MIXR ADC2 Switch' off"
+
+               cset "name='RECMIXL BST1 Switch' on"
+               cset "name='RECMIXR BST1 Switch' on"
+
        ]
 
        DisableSequence [
                cdev "hw:chtrt5645"
 
                cset "name='Headset Mic Switch' off"
+
                cset "name='RECMIXL BST1 Switch' off"
                cset "name='RECMIXR BST1 Switch' off"
                cset "name='Sto1 ADC MIXL ADC1 Switch' off"
                cset "name='Sto1 ADC MIXR ADC1 Switch' off"
+               cset "name='Mono ADC MIXL ADC1 Switch' on"
+               cset "name='Mono ADC MIXR ADC1 Switch' on"
+
        ]
 }