conf/ucm: bytcr-rt5651: Enable Stereo? ADC MIXL ADC? switches when enabling inputs

Explicitly enable the right 'Stereo? ADC MIXL ADC?' when selecting an input,
rather then just enabling them all in ucm/codecs/rt5651/EnableSeq.conf .

This is a preparation patch for adding digital mic support.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/src/conf/ucm/codecs/rt5651/EnableSeq.conf b/src/conf/ucm/codecs/rt5651/EnableSeq.conf
index 6fb3c1f28d8b6431afbdaee5c171f3df840c21f4..db2fd328323f3c8d939d986a02a0d5a19c186ab4 100644 (file)
--- a/src/conf/ucm/codecs/rt5651/EnableSeq.conf
+++ b/src/conf/ucm/codecs/rt5651/EnableSeq.conf
@@ -14,12 +14,14 @@ cset "name='Stereo DAC MIXL DAC L1 Switch' on"
 cset "name='Stereo DAC MIXL DAC R1 Switch' off"
 cset "name='Stereo DAC MIXR DAC L1 Switch' off"
 cset "name='Stereo DAC MIXR DAC R1 Switch' on"
-cset "name='Stereo1 ADC MIXR ADC1 Switch' on"
-cset "name='Stereo1 ADC MIXR ADC2 Switch' on"
-cset "name='Stereo2 ADC MIXL ADC1 Switch' on"
-cset "name='Stereo2 ADC MIXL ADC2 Switch' on"
-cset "name='Stereo2 ADC MIXR ADC1 Switch' on"
-cset "name='Stereo2 ADC MIXR ADC2 Switch' on"
+cset "name='Stereo1 ADC MIXL ADC1 Switch' off"
+cset "name='Stereo1 ADC MIXR ADC1 Switch' off"
+cset "name='Stereo1 ADC MIXL ADC2 Switch' off"
+cset "name='Stereo1 ADC MIXR ADC2 Switch' off"
+cset "name='Stereo2 ADC MIXL ADC1 Switch' off"
+cset "name='Stereo2 ADC MIXR ADC1 Switch' off"
+cset "name='Stereo2 ADC MIXL ADC2 Switch' off"
+cset "name='Stereo2 ADC MIXR ADC2 Switch' off"
 cset "name='Headphone Switch' off"
 cset "name='Speaker Switch' off"
 
@@ -41,8 +43,6 @@ cset "name='IN3 Boost' 1"
 # input
 cset "name='Stereo1 ADC L1 Mux' ADC"
 cset "name='Stereo1 ADC R1 Mux' ADC"
-cset "name='Stereo1 ADC MIXL ADC1 Switch' on"
-cset "name='Stereo1 ADC MIXR ADC1 Switch' on"
 cset "name='RECMIXL BST1 Switch' off"
 cset "name='RECMIXR BST1 Switch' off"
 cset "name='RECMIXL BST3 Switch' off"

diff --git a/src/conf/ucm/codecs/rt5651/IN1-InternalMic.conf b/src/conf/ucm/codecs/rt5651/IN1-InternalMic.conf
index 85e25a5cb948fe750a43b72c962848b1e2eaf56f..b2ce17b6629115e52901a890454bf6f187c5af8d 100644 (file)
--- a/src/conf/ucm/codecs/rt5651/IN1-InternalMic.conf
+++ b/src/conf/ucm/codecs/rt5651/IN1-InternalMic.conf
@@ -12,10 +12,14 @@ SectionDevice."InternalMic-IN1" {
                cset "name='Internal Mic Switch' on"
                cset "name='RECMIXL BST1 Switch' on"
                cset "name='RECMIXR BST1 Switch' on"
+               cset "name='Stereo1 ADC MIXL ADC1 Switch' on"
+               cset "name='Stereo1 ADC MIXR ADC1 Switch' on"
        ]
 
        DisableSequence [
                cdev "hw:bytcrrt5651"
+               cset "name='Stereo1 ADC MIXL ADC1 Switch' off"
+               cset "name='Stereo1 ADC MIXR ADC1 Switch' off"
                cset "name='Internal Mic Switch' off"
                cset "name='RECMIXL BST1 Switch' off"
                cset "name='RECMIXR BST1 Switch' off"

diff --git a/src/conf/ucm/codecs/rt5651/IN12-InternalMic.conf b/src/conf/ucm/codecs/rt5651/IN12-InternalMic.conf
index f1cc17fe95c11b0320997d7457fda0922b1292f8..e80419122745cd42ab7e59b8c7088df988a83e52 100644 (file)
--- a/src/conf/ucm/codecs/rt5651/IN12-InternalMic.conf
+++ b/src/conf/ucm/codecs/rt5651/IN12-InternalMic.conf
@@ -14,10 +14,14 @@ SectionDevice."InternalMic-IN12" {
                cset "name='RECMIXR BST1 Switch' on"
                cset "name='RECMIXL BST2 Switch' on"
                cset "name='RECMIXR BST2 Switch' on"
+               cset "name='Stereo1 ADC MIXL ADC1 Switch' on"
+               cset "name='Stereo1 ADC MIXR ADC1 Switch' on"
        ]
 
        DisableSequence [
                cdev "hw:bytcrrt5651"
+               cset "name='Stereo1 ADC MIXL ADC1 Switch' off"
+               cset "name='Stereo1 ADC MIXR ADC1 Switch' off"
                cset "name='Internal Mic Switch' off"
                cset "name='RECMIXL BST1 Switch' off"
                cset "name='RECMIXR BST1 Switch' off"

diff --git a/src/conf/ucm/codecs/rt5651/IN2-InternalMic.conf b/src/conf/ucm/codecs/rt5651/IN2-InternalMic.conf
index 18f74e1ad17ff9b559de3589c31d46ecbd0dce7b..048fcc950ea610e75528391be357a6136544124f 100644 (file)
--- a/src/conf/ucm/codecs/rt5651/IN2-InternalMic.conf
+++ b/src/conf/ucm/codecs/rt5651/IN2-InternalMic.conf
@@ -12,10 +12,14 @@ SectionDevice."InternalMic-IN2" {
                cset "name='Internal Mic Switch' on"
                cset "name='RECMIXL BST2 Switch' on"
                cset "name='RECMIXR BST2 Switch' on"
+               cset "name='Stereo1 ADC MIXL ADC1 Switch' on"
+               cset "name='Stereo1 ADC MIXR ADC1 Switch' on"
        ]
 
        DisableSequence [
                cdev "hw:bytcrrt5651"
+               cset "name='Stereo1 ADC MIXL ADC1 Switch' off"
+               cset "name='Stereo1 ADC MIXR ADC1 Switch' off"
                cset "name='Internal Mic Switch' off"
                cset "name='RECMIXL BST2 Switch' off"
                cset "name='RECMIXR BST2 Switch' off"

diff --git a/src/conf/ucm/codecs/rt5651/IN3-HeadsetMic.conf b/src/conf/ucm/codecs/rt5651/IN3-HeadsetMic.conf
index bfd0b009ba9094cffb63b1a59a37073b6b0b5f9e..712d14bb9e2251e074abaac0d91707ec12ee6111 100644 (file)
--- a/src/conf/ucm/codecs/rt5651/IN3-HeadsetMic.conf
+++ b/src/conf/ucm/codecs/rt5651/IN3-HeadsetMic.conf
@@ -12,10 +12,14 @@ SectionDevice."HeadsetMic-IN3" {
                cset "name='Headset Mic Switch' on"
                cset "name='RECMIXL BST3 Switch' on"
                cset "name='RECMIXR BST3 Switch' on"
+               cset "name='Stereo1 ADC MIXL ADC1 Switch' on"
+               cset "name='Stereo1 ADC MIXR ADC1 Switch' on"
        ]
 
        DisableSequence [
                cdev "hw:bytcrrt5651"
+               cset "name='Stereo1 ADC MIXL ADC1 Switch' off"
+               cset "name='Stereo1 ADC MIXR ADC1 Switch' off"
                cset "name='Headset Mic Switch' off"
                cset "name='RECMIXL BST3 Switch' off"
                cset "name='RECMIXR BST3 Switch' off"