Factor out rt5645 variants Headset+Digital Mic UCM shared {en,dis}able sequences

Signed-off-by: Russell Parker <russell.parker7@gmail.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf b/src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf
index 0f09d292e7f73a41d3d8597de91d58447db5f1ff..87e0e4ec99a57b0910f094478d0bd4bc4b0e22e2 100644 (file)
--- a/src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf
+++ b/src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf
@@ -92,31 +92,18 @@ SectionDevice."DMic".0 {
        EnableSequence [
                cdev "hw:chtrt5645"
 
-               cset "name='Int Mic Switch' on"
+               <codecs/rt5645/DigitalMicEnableSeq.conf>
 
                cset "name='Stereo1 DMIC Mux' DMIC1"
                cset "name='Stereo1 ADC2 Mux' DMIC"
                cset "name='Mono ADC L2 Mux' DMIC"
                cset "name='Mono ADC R2 Mux' DMIC"
-
-               cset "name='Sto1 ADC MIXL ADC1 Switch' off"
-               cset "name='Sto1 ADC MIXR ADC1 Switch' off"
-               cset "name='Sto1 ADC MIXL ADC2 Switch' on"
-               cset "name='Sto1 ADC MIXR ADC2 Switch' on"
-               cset "name='Mono ADC MIXL ADC1 Switch' off"
-               cset "name='Mono ADC MIXR ADC1 Switch' off"
-               cset "name='Mono ADC MIXL ADC2 Switch' on"
-               cset "name='Mono ADC MIXR ADC2 Switch' on"
        ]
 
        DisableSequence [
                cdev "hw:chtrt5645"
 
-               cset "name='Sto1 ADC MIXL ADC2 Switch' off"
-               cset "name='Sto1 ADC MIXR ADC2 Switch' off"
-               cset "name='Mono ADC MIXL ADC2 Switch' off"
-               cset "name='Mono ADC MIXR ADC2 Switch' off"
-               cset "name='Int Mic Switch' off"
+               <codecs/rt5645/DigitalMicDisableSeq.conf>
        ]
 }
 
@@ -132,10 +119,8 @@ SectionDevice."HSMic".0 {
        EnableSequence [
                cdev "hw:chtrt5645"
 
-               cset "name='Headset Mic Switch' on"
+               <codecs/rt5645/HSMicEnableSeq.conf>
 
-               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"
 
@@ -143,23 +128,14 @@ SectionDevice."HSMic".0 {
                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"
+               <codecs/rt5645/HSMicEnableSeq.conf>
 
-               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"
-
        ]
 }

diff --git a/src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf b/src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf
index 31e06e0d15847f203bf2f88b9497ffb95048cc35..8930fe892a79b76d8f57bc75707f0e633ab6061c 100644 (file)
--- a/src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf
+++ b/src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf
@@ -92,7 +92,7 @@ SectionDevice."DMic".0 {
        EnableSequence [
                cdev "hw:chtrt5645"
 
-               cset "name='Int Mic Switch' on"
+               <codecs/rt5645/DigitalMicEnableSeq.conf>
 
                cset "name='Stereo1 DMIC Mux' DMIC2"
                cset "name='Stereo1 ADC2 Mux' DMIC"
@@ -100,25 +100,12 @@ SectionDevice."DMic".0 {
                cset "name='Mono DMIC R Mux' DMIC2"
                cset "name='Mono ADC L2 Mux' DMIC"
                cset "name='Mono ADC R2 Mux' DMIC"
-
-               cset "name='Sto1 ADC MIXL ADC1 Switch' off"
-               cset "name='Sto1 ADC MIXR ADC1 Switch' off"
-               cset "name='Sto1 ADC MIXL ADC2 Switch' on"
-               cset "name='Sto1 ADC MIXR ADC2 Switch' on"
-               cset "name='Mono ADC MIXL ADC1 Switch' off"
-               cset "name='Mono ADC MIXR ADC1 Switch' off"
-               cset "name='Mono ADC MIXL ADC2 Switch' on"
-               cset "name='Mono ADC MIXR ADC2 Switch' on"
        ]
 
        DisableSequence [
                cdev "hw:chtrt5645"
 
-               cset "name='Sto1 ADC MIXL ADC2 Switch' off"
-               cset "name='Sto1 ADC MIXR ADC2 Switch' off"
-               cset "name='Mono ADC MIXL ADC2 Switch' off"
-               cset "name='Mono ADC MIXR ADC2 Switch' off"
-               cset "name='Int Mic Switch' off"
+               <codecs/rt5645/DigitalMicDisableSeq.conf>
        ]
 }
 
@@ -134,10 +121,8 @@ SectionDevice."HSMic".0 {
        EnableSequence [
                cdev "hw:chtrt5645"
 
-               cset "name='Headset Mic Switch' on"
+               <codecs/rt5645/HSMicEnableSeq.conf>
 
-               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"
 
@@ -145,23 +130,14 @@ SectionDevice."HSMic".0 {
                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"
+               <codecs/rt5645/HSMicEnableSeq.conf>
 
-               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"
-
        ]
 }

diff --git a/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf b/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf
index 36dcca30dd3f36429c8c0922fa1b3c65f981a98f..f66d09a45a56de42d3fa9e35da4f93d248665813 100644 (file)
--- a/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf
+++ b/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf
@@ -145,10 +145,8 @@ SectionDevice."HSMic".0 {
        EnableSequence [
                cdev "hw:chtrt5645"
 
-               cset "name='Headset Mic Switch' on"
+               <codecs/rt5645/HSMicEnableSeq.conf>
 
-               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"
 
@@ -156,23 +154,14 @@ SectionDevice."HSMic".0 {
                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"
+               <codecs/rt5645/HSMicDisableSeq.conf>
 
-               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"
-
        ]
 }

diff --git a/src/conf/ucm/chtrt5645/HiFi.conf b/src/conf/ucm/chtrt5645/HiFi.conf
index 7d4f0c4823d86a38f61b3f97864f4c24ee979450..7250822d3567f8b154ab57d20514ed308858e772 100644 (file)
--- a/src/conf/ucm/chtrt5645/HiFi.conf
+++ b/src/conf/ucm/chtrt5645/HiFi.conf
@@ -136,10 +136,8 @@ SectionDevice."HSMic".0 {
        EnableSequence [
                cdev "hw:chtrt5645"
 
-               cset "name='Headset Mic Switch' on"
+               <codecs/rt5645/HSMicEnableSeq.conf>
 
-               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"
 
@@ -147,23 +145,14 @@ SectionDevice."HSMic".0 {
                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"
+               <codecs/rt5645/HSMicDisableSeq.conf>
 
-               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"
-
        ]
 }

diff --git a/src/conf/ucm/chtrt5650/HiFi.conf b/src/conf/ucm/chtrt5650/HiFi.conf
index ad138511a4ed15a83d6973bc22ebc309b6f4210d..71df1f84d84814c94a60acf4f557fd89346e33ce 100644 (file)
--- a/src/conf/ucm/chtrt5650/HiFi.conf
+++ b/src/conf/ucm/chtrt5650/HiFi.conf
@@ -118,22 +118,16 @@ SectionDevice."HSMic".0 {
        EnableSequence [
                cdev "hw:chtrt5650"
 
-               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"
+               <codecs/rt5645/HSMicEnableSeq.conf>
+
                cset "name='IN1 Boost' 1"
        ]
 
        DisableSequence [
                cdev "hw:chtrt5650"
 
-               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"
+               <codecs/rt5645/HSMicDisableSeq.conf>
+
                cset "name='IN1 Boost' 0"
        ]
 }

diff --git a/src/conf/ucm/codecs/rt5645/DigitalMicDisableSeq.conf b/src/conf/ucm/codecs/rt5645/DigitalMicDisableSeq.conf
new file mode 100644 (file)
index 0000000..751f38c
--- /dev/null
+++ b/src/conf/ucm/codecs/rt5645/DigitalMicDisableSeq.conf
@@ -0,0 +1,5 @@
+cset "name='Sto1 ADC MIXL ADC2 Switch' off"
+cset "name='Sto1 ADC MIXR ADC2 Switch' off"
+cset "name='Mono ADC MIXL ADC2 Switch' off"
+cset "name='Mono ADC MIXR ADC2 Switch' off"
+cset "name='Int Mic Switch' off"

diff --git a/src/conf/ucm/codecs/rt5645/DigitalMicEnableSeq.conf b/src/conf/ucm/codecs/rt5645/DigitalMicEnableSeq.conf
new file mode 100644 (file)
index 0000000..cb243b3
--- /dev/null
+++ b/src/conf/ucm/codecs/rt5645/DigitalMicEnableSeq.conf
@@ -0,0 +1,10 @@
+cset "name='Int Mic Switch' on"
+
+cset "name='Sto1 ADC MIXL ADC1 Switch' off"
+cset "name='Sto1 ADC MIXR ADC1 Switch' off"
+cset "name='Sto1 ADC MIXL ADC2 Switch' on"
+cset "name='Sto1 ADC MIXR ADC2 Switch' on"
+cset "name='Mono ADC MIXL ADC1 Switch' off"
+cset "name='Mono ADC MIXR ADC1 Switch' off"
+cset "name='Mono ADC MIXL ADC2 Switch' on"
+cset "name='Mono ADC MIXR ADC2 Switch' on"

diff --git a/src/conf/ucm/codecs/rt5645/HSMicDisableSeq.conf b/src/conf/ucm/codecs/rt5645/HSMicDisableSeq.conf
new file mode 100644 (file)
index 0000000..ef42b17
--- /dev/null
+++ b/src/conf/ucm/codecs/rt5645/HSMicDisableSeq.conf
@@ -0,0 +1,6 @@
+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"

diff --git a/src/conf/ucm/codecs/rt5645/HSMicEnableSeq.conf b/src/conf/ucm/codecs/rt5645/HSMicEnableSeq.conf
new file mode 100644 (file)
index 0000000..6c26d68
--- /dev/null
+++ b/src/conf/ucm/codecs/rt5645/HSMicEnableSeq.conf
@@ -0,0 +1,7 @@
+cset "name='Headset Mic Switch' on"
+
+cset "name='Sto1 ADC MIXL ADC1 Switch' on"
+cset "name='Sto1 ADC MIXR ADC1 Switch' on"
+
+cset "name='RECMIXL BST1 Switch' on"
+cset "name='RECMIXR BST1 Switch' on"

diff --git a/src/conf/ucm/codecs/rt5645/Makefile.am b/src/conf/ucm/codecs/rt5645/Makefile.am
index 86d3fc8159c97d295352e9a7e83786f246812178..61c483b4e2512743cda745a8d7e4462a1e09d482 100644 (file)
--- a/src/conf/ucm/codecs/rt5645/Makefile.am
+++ b/src/conf/ucm/codecs/rt5645/Makefile.am
@@ -1,5 +1,7 @@
 alsaconfigdir = @ALSA_CONFIG_DIR@
 ucmdir = $(alsaconfigdir)/ucm/codecs/rt5645
 ucm_DATA = DisableSeq.conf EnableSeq.conf HeadphonesEnableSeq.conf \
-                  SpeakerEnableSeq.conf
+                  SpeakerEnableSeq.conf DigitalMicDisableSeq.conf \
+                  DigitalMicEnableSeq.conf HSMicDisableSeq.conf \
+                  HSMicEnableSeq.conf
 EXTRA_DIST = $(ucm_DATA)