Factor out rt5645 variants Speaker+Headphones shared UCM enable sequences

Move common enable sequences for rt5645 variants and rt5650
UCM configurations into a shared component. The corresponding
disable sequences are only two lines each and do not seem worth
creating components for.

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

diff --git a/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf b/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf
index 46084b3..0f09d29 100644 (file)
--- a/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf
+++ b/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf
@@ -43,12 +43,7 @@ SectionDevice."Speaker" {
        EnableSequence [
                cdev "hw:chtrt5645"
 
-               cset "name='Headphone Switch' off"
-               cset "name='Headphone Channel Switch' off"
-
-               cset "name='Ext Spk Switch' on"
-               cset "name='Speaker Channel Switch' on"
-               cset "name='Speaker Playback Volume' 31"
+               <codecs/rt5645/SpeakerEnableSeq.conf>
        ]
 
        DisableSequence [
@@ -75,13 +70,7 @@ SectionDevice."Headphones" {
        EnableSequence [
                cdev "hw:chtrt5645"
 
-               cset "name='Ext Spk Switch' off"
-               cset "name='Speaker Channel Switch' off"
-
-               cset "name='Headphone Switch' on"
-               cset "name='Headphone Channel Switch' on"
-               # 25/39 higher values cause crackling on some boards
-               cset "name='Headphone Playback Volume' 25"
+               <codecs/rt5645/HeadphonesEnableSeq.conf>
        ]
 
        DisableSequence [

diff --git a/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf b/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf
index 4896a2a..31e06e0 100644 (file)
--- a/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf
+++ b/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf
@@ -43,12 +43,7 @@ SectionDevice."Speaker" {
        EnableSequence [
                cdev "hw:chtrt5645"
 
-               cset "name='Headphone Switch' off"
-               cset "name='Headphone Channel Switch' off"
-
-               cset "name='Ext Spk Switch' on"
-               cset "name='Speaker Channel Switch' on"
-               cset "name='Speaker Playback Volume' 31"
+               <codecs/rt5645/SpeakerEnableSeq.conf>
        ]
 
        DisableSequence [
@@ -75,13 +70,7 @@ SectionDevice."Headphones" {
        EnableSequence [
                cdev "hw:chtrt5645"
 
-               cset "name='Ext Spk Switch' off"
-               cset "name='Speaker Channel Switch' off"
-
-               cset "name='Headphone Switch' on"
-               cset "name='Headphone Channel Switch' on"
-               # 25/39 higher values cause crackling on some boards
-               cset "name='Headphone Playback Volume' 25"
+               <codecs/rt5645/HeadphonesEnableSeq.conf>
        ]
 
        DisableSequence [

diff --git a/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf b/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf
index d7d8dfb..36dcca3 100644 (file)
--- a/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf
+++ b/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf
@@ -47,12 +47,7 @@ SectionDevice."Speaker" {
                cset "name='Stereo DAC MIXL DAC R1 Switch' 1"
                cset "name='Stereo DAC MIXR DAC R1 Switch' 0"
 
-               cset "name='Headphone Switch' off"
-               cset "name='Headphone Channel Switch' off"
-
-               cset "name='Ext Spk Switch' on"
-               cset "name='Speaker Channel Switch' on"
-               cset "name='Speaker Playback Volume' 31"
+               <codecs/rt5645/SpeakerEnableSeq.conf>
        ]
 
        DisableSequence [
@@ -83,13 +78,7 @@ SectionDevice."Headphones" {
                cset "name='Stereo DAC MIXL DAC R1 Switch' 0"
                cset "name='Stereo DAC MIXR DAC R1 Switch' 1"
 
-               cset "name='Ext Spk Switch' off"
-               cset "name='Speaker Channel Switch' off"
-
-               cset "name='Headphone Switch' on"
-               cset "name='Headphone Channel Switch' on"
-               # 25/39 higher values cause crackling on some boards
-               cset "name='Headphone Playback Volume' 25"
+               <codecs/rt5645/HeadphonesEnableSeq.conf>
        ]
 
        DisableSequence [

diff --git a/ucm/chtrt5645/HiFi.conf b/ucm/chtrt5645/HiFi.conf
index b803cb2..7d4f0c4 100644 (file)
--- a/ucm/chtrt5645/HiFi.conf
+++ b/ucm/chtrt5645/HiFi.conf
@@ -43,12 +43,7 @@ SectionDevice."Speaker" {
        EnableSequence [
                cdev "hw:chtrt5645"
 
-               cset "name='Headphone Switch' off"
-               cset "name='Headphone Channel Switch' off"
-
-               cset "name='Ext Spk Switch' on"
-               cset "name='Speaker Channel Switch' on"
-               cset "name='Speaker Playback Volume' 31"
+               <codecs/rt5645/SpeakerEnableSeq.conf>
        ]
 
        DisableSequence [
@@ -75,13 +70,7 @@ SectionDevice."Headphones" {
        EnableSequence [
                cdev "hw:chtrt5645"
 
-               cset "name='Ext Spk Switch' off"
-               cset "name='Speaker Channel Switch' off"
-
-               cset "name='Headphone Switch' on"
-               cset "name='Headphone Channel Switch' on"
-               # 25/39 higher values cause crackling on some boards
-               cset "name='Headphone Playback Volume' 25"
+               <codecs/rt5645/HeadphonesEnableSeq.conf>
        ]
 
        DisableSequence [

diff --git a/ucm/chtrt5650/HiFi.conf b/ucm/chtrt5650/HiFi.conf
index a638da5..ad13851 100644 (file)
--- a/ucm/chtrt5650/HiFi.conf
+++ b/ucm/chtrt5650/HiFi.conf
@@ -43,12 +43,7 @@ SectionDevice."Speaker" {
        EnableSequence [
                cdev "hw:chtrt5650"
 
-               cset "name='Headphone Switch' off"
-               cset "name='Headphone Channel Switch' off"
-
-               cset "name='Ext Spk Switch' on"
-               cset "name='Speaker Channel Switch' on"
-               cset "name='Speaker Playback Volume' 31"
+               <codecs/rt5645/SpeakerEnableSeq.conf>
        ]
 
        DisableSequence [
@@ -75,12 +70,7 @@ SectionDevice."Headphones" {
        EnableSequence [
                cdev "hw:chtrt5650"
 
-               cset "name='Ext Spk Switch' off"
-               cset "name='Speaker Channel Switch' off"
-
-               cset "name='Headphone Switch' on"
-               cset "name='Headphone Channel Switch' on"
-               cset "name='Headphone Playback Volume' 31"
+               <codecs/rt5645/HeadphonesEnableSeq.conf>
        ]
 
        DisableSequence [

diff --git a/ucm/codecs/rt5645/HeadphonesEnableSeq.conf b/ucm/codecs/rt5645/HeadphonesEnableSeq.conf
new file mode 100644 (file)
index 0000000..6c231da
--- /dev/null
+++ b/ucm/codecs/rt5645/HeadphonesEnableSeq.conf
@@ -0,0 +1,7 @@
+cset "name='Ext Spk Switch' off"
+cset "name='Speaker Channel Switch' off"
+
+cset "name='Headphone Switch' on"
+cset "name='Headphone Channel Switch' on"
+# 25/39 higher values cause crackling on some boards
+cset "name='Headphone Playback Volume' 25"

diff --git a/ucm/codecs/rt5645/SpeakerEnableSeq.conf b/ucm/codecs/rt5645/SpeakerEnableSeq.conf
new file mode 100644 (file)
index 0000000..2cc62fc
--- /dev/null
+++ b/ucm/codecs/rt5645/SpeakerEnableSeq.conf
@@ -0,0 +1,6 @@
+cset "name='Headphone Switch' off"
+cset "name='Headphone Channel Switch' off"
+
+cset "name='Ext Spk Switch' on"
+cset "name='Speaker Channel Switch' on"
+cset "name='Speaker Playback Volume' 31"