Create device component for rt5645 Internal Analog Mic UCM

Since the Internal Analog Microphone device configuration is
identical for the rt5645 and rt5645 mono speaker UCMs, move
the entire definition to a component.

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

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 f66d09a45a56de42d3fa9e35da4f93d248665813..43cb4d63b2d32df0fd03980ab48d69f756c55b4b 100644 (file)
--- a/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf
+++ b/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf
@@ -89,49 +89,7 @@ SectionDevice."Headphones" {
        ]
 }
 
-SectionDevice."Mic".0 {
-       Comment "Internal Analog Microphone"
-
-       Value {
-               CaptureChannels "2"
-               CapturePriority "150"
-       }
-
-       EnableSequence [
-               cdev "hw:chtrt5645"
-
-               cset "name='Int Analog Mic 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 BST2 Switch' on"
-               cset "name='RECMIXR BST2 Switch' on"
-
-       ]
-
-       DisableSequence [
-               cdev "hw:chtrt5645"
-
-               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 BST2 Switch' off"
-               cset "name='RECMIXR BST2 Switch' off"
-
-               cset "name='Int Analog Mic Switch' off"
-       ]
-}
-
+<codecs/rt5645/AnalogMic.conf>
 
 SectionDevice."HSMic".0 {
        Comment "Headset Microphone"

diff --git a/src/conf/ucm/chtrt5645/HiFi.conf b/src/conf/ucm/chtrt5645/HiFi.conf
index 7250822d3567f8b154ab57d20514ed308858e772..53300f6227815da52681203262d090d8fd4152fa 100644 (file)
--- a/src/conf/ucm/chtrt5645/HiFi.conf
+++ b/src/conf/ucm/chtrt5645/HiFi.conf
@@ -81,48 +81,7 @@ SectionDevice."Headphones" {
        ]
 }
 
-SectionDevice."Mic".0 {
-       Comment "Internal Analog Microphone"
-
-       Value {
-               CaptureChannels "2"
-               CapturePriority "150"
-       }
-
-       EnableSequence [
-               cdev "hw:chtrt5645"
-
-               cset "name='Int Analog Mic 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 BST2 Switch' on"
-               cset "name='RECMIXR BST2 Switch' on"
-
-       ]
-
-       DisableSequence [
-               cdev "hw:chtrt5645"
-
-               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 BST2 Switch' off"
-               cset "name='RECMIXR BST2 Switch' off"
-
-               cset "name='Int Analog Mic Switch' off"
-       ]
-}
+<codecs/rt5645/AnalogMic.conf>
 
 SectionDevice."HSMic".0 {
        Comment "Headset Microphone"

diff --git a/src/conf/ucm/codecs/rt5645/AnalogMic.conf b/src/conf/ucm/codecs/rt5645/AnalogMic.conf
new file mode 100644 (file)
index 0000000..cbcefa7
--- /dev/null
+++ b/src/conf/ucm/codecs/rt5645/AnalogMic.conf
@@ -0,0 +1,41 @@
+SectionDevice."Mic".0 {
+       Comment "Internal Analog Microphone"
+
+       Value {
+               CaptureChannels "2"
+               CapturePriority "150"
+       }
+
+       EnableSequence [
+               cdev "hw:chtrt5645"
+
+               cset "name='Int Analog Mic 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 BST2 Switch' on"
+               cset "name='RECMIXR BST2 Switch' on"
+       ]
+
+       DisableSequence [
+               cdev "hw:chtrt5645"
+
+               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 BST2 Switch' off"
+               cset "name='RECMIXR BST2 Switch' off"
+
+               cset "name='Int Analog Mic Switch' off"
+       ]
+}

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