Update chtrt5645 ucm variants to use bytcr/PlatformEnableSeq.conf component

The Lenovo Ideapad Miix 320, Asus T100HA, and chtrt5645 mono variant
UCM configurations have not been updated to make use of the shared
bytcr/PlatfromEnableSeq.conf sequence. This commit deletes those
command sequences and loads the shared component directly.

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 78bf9823cb3b62bd236cd665f5817edd38e95570..61848358b3b8b38d778ac3654a4cdab240052117 100644 (file)
--- a/src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf
+++ b/src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf
@@ -11,121 +11,7 @@ SectionVerb {
        EnableSequence [
                cdev "hw:chtrt5645"
 
-               # media mixer settings
-               #   compress
-               cset "name='media0_in Gain 0 Switch' on"
-               cset "name='media0_in Gain 0 Volume' 0"
-
-               #   normal
-               cset "name='media1_in Gain 0 Switch' on"
-               cset "name='media1_in Gain 0 Volume' 0"
-               #   swm loopback
-               cset "name='media2_in Gain 0 Switch' off"
-               cset "name='media2_in Gain 0 Volume' 0%"
-               #   deep buffer
-               cset "name='media3_in Gain 0 Switch' on"
-               cset "name='media3_in Gain 0 Volume' 0"
-
-               cset "name='media0_out mix 0 media0_in Switch' on"
-               cset "name='media0_out mix 0 media1_in Switch' on"
-               cset "name='media0_out mix 0 media2_in Switch' off"
-               cset "name='media0_out mix 0 media3_in Switch' on"
-
-               cset "name='media1_out mix 0 media0_in Switch' off"
-               cset "name='media1_out mix 0 media1_in Switch' off"
-               cset "name='media1_out mix 0 media2_in Switch' off"
-               cset "name='media1_out mix 0 media3_in Switch' off"
-
-               cset "name='pcm0_in Gain 0 Switch' on"
-               cset "name='pcm0_in Gain 0 Volume' 0"
-
-               cset "name='pcm1_in Gain 0 Switch' off"
-               cset "name='pcm1_in Gain 0 Volume' 0%"
-
-               # codec0_out settings (used if ssp2 is connected to aif1)
-               cset "name='codec_out0 mix 0 codec_in0 Switch' off"
-               cset "name='codec_out0 mix 0 codec_in1 Switch' off"
-               cset "name='codec_out0 mix 0 media_loop1_in Switch' off"
-               cset "name='codec_out0 mix 0 media_loop2_in Switch' off"
-               cset "name='codec_out0 mix 0 pcm0_in Switch' on"
-               cset "name='codec_out0 mix 0 pcm1_in Switch' off"
-               cset "name='codec_out0 mix 0 sprot_loop_in Switch' off"
-               cset "name='codec_out0 Gain 0 Switch' on"
-               cset "name='codec_out0 Gain 0 Volume' 0"
-
-               # modem_out settings (used if ssp0 is connected to aif2)
-               cset "name='modem_out mix 0 codec_in0 Switch' off"
-               cset "name='modem_out mix 0 codec_in1 Switch' off"
-               cset "name='modem_out mix 0 media_loop1_in Switch' off"
-               cset "name='modem_out mix 0 media_loop2_in Switch' off"
-               cset "name='modem_out mix 0 pcm0_in Switch' on"
-               cset "name='modem_out mix 0 pcm1_in Switch' off"
-               cset "name='modem_out mix 0 sprot_loop_in Switch' off"
-               cset "name='modem_out Gain 0 Switch' on"
-               cset "name='modem_out Gain 0 Volume' 0"
-
-               # input settings
-               # pcm1_out settings
-
-               # input used when SSP2 is connected
-               cset "name='codec_in0 Gain 0 Switch' on"
-               cset "name='codec_in0 Gain 0 Volume' 0"
-
-               # input used when SSP0 is connected
-               cset "name='modem_in Gain 0 Switch' on"
-               cset "name='modem_in Gain 0 Volume' 0"
-
-               cset "name='pcm1_out mix 0 codec_in0 Switch' on"
-               cset "name='pcm1_out mix 0 modem_in Switch' on"
-               cset "name='pcm1_out mix 0 codec_in1 Switch' off"
-               cset "name='pcm1_out mix 0 media_loop1_in Switch' off"
-               cset "name='pcm1_out mix 0 media_loop2_in Switch' off"
-               cset "name='pcm1_out mix 0 pcm0_in Switch' off"
-               cset "name='pcm1_out mix 0 pcm1_in Switch' off"
-               cset "name='pcm1_out mix 0 sprot_loop_in Switch' off"
-
-               cset "name='pcm1_out Gain 0 Switch' on"
-               cset "name='pcm1_out Gain 0 Volume' 0"
-
-               # disable codec_out1
-               cset "name='codec_out1 mix 0 codec_in0 Switch' off"
-               cset "name='codec_out1 mix 0 codec_in1 Switch' off"
-               cset "name='codec_out1 mix 0 media_loop1_in Switch' off"
-               cset "name='codec_out1 mix 0 media_loop2_in Switch' off"
-               cset "name='codec_out1 mix 0 pcm0_in Switch' off"
-               cset "name='codec_out1 mix 0 pcm1_in Switch' off"
-               cset "name='codec_out1 mix 0 sprot_loop_in Switch' off"
-               cset "name='codec_out1 Gain 0 Switch' off"
-               cset "name='codec_out1 Gain 0 Volume' 0%"
-
-               # disable codec_in1
-               cset "name='codec_in1 Gain 0 Switch' off"
-               cset "name='codec_in1 Gain 0 Volume' 0%"
-
-               # disable all loops
-               cset "name='media_loop1_out mix 0 codec_in0 Switch' off"
-               cset "name='media_loop1_out mix 0 codec_in1 Switch' off"
-               cset "name='media_loop1_out mix 0 media_loop1_in Switch' off"
-               cset "name='media_loop1_out mix 0 media_loop2_in Switch' off"
-               cset "name='media_loop1_out mix 0 pcm0_in Switch' off"
-               cset "name='media_loop1_out mix 0 pcm1_in Switch' off"
-               cset "name='media_loop1_out mix 0 sprot_loop_in Switch' off"
-
-               cset "name='media_loop2_out mix 0 codec_in0 Switch' off"
-               cset "name='media_loop2_out mix 0 codec_in1 Switch' off"
-               cset "name='media_loop2_out mix 0 media_loop1_in Switch' off"
-               cset "name='media_loop2_out mix 0 media_loop2_in Switch' off"
-               cset "name='media_loop2_out mix 0 pcm0_in Switch' off"
-               cset "name='media_loop2_out mix 0 pcm1_in Switch' off"
-               cset "name='media_loop2_out mix 0 sprot_loop_in Switch' off"
-
-               cset "name='sprot_loop_out mix 0 codec_in0 Switch' off"
-               cset "name='sprot_loop_out mix 0 codec_in1 Switch' off"
-               cset "name='sprot_loop_out mix 0 media_loop1_in Switch' off"
-               cset "name='sprot_loop_out mix 0 media_loop2_in Switch' off"
-               cset "name='sprot_loop_out mix 0 pcm0_in Switch' off"
-               cset "name='sprot_loop_out mix 0 pcm1_in Switch' off"
-               cset "name='sprot_loop_out mix 0 sprot_loop_in Switch' off"
+               <platforms/bytcr/PlatformEnableSeq.conf>
 
                # Output Configuration
                cset "name='DAC1 L Mux' IF1 DAC"

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 8cc9c7f28f0edeadd10c00aef7fcf17ba2f2b8d4..d043f685da224d8b4172a1b5d91444110ad4f1eb 100644 (file)
--- a/src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf
+++ b/src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf
@@ -11,121 +11,7 @@ SectionVerb {
        EnableSequence [
                cdev "hw:chtrt5645"
 
-               # media mixer settings
-               #   compress
-               cset "name='media0_in Gain 0 Switch' on"
-               cset "name='media0_in Gain 0 Volume' 0"
-
-               #   normal
-               cset "name='media1_in Gain 0 Switch' on"
-               cset "name='media1_in Gain 0 Volume' 0"
-               #   swm loopback
-               cset "name='media2_in Gain 0 Switch' off"
-               cset "name='media2_in Gain 0 Volume' 0%"
-               #   deep buffer
-               cset "name='media3_in Gain 0 Switch' on"
-               cset "name='media3_in Gain 0 Volume' 0"
-
-               cset "name='media0_out mix 0 media0_in Switch' on"
-               cset "name='media0_out mix 0 media1_in Switch' on"
-               cset "name='media0_out mix 0 media2_in Switch' off"
-               cset "name='media0_out mix 0 media3_in Switch' on"
-
-               cset "name='media1_out mix 0 media0_in Switch' off"
-               cset "name='media1_out mix 0 media1_in Switch' off"
-               cset "name='media1_out mix 0 media2_in Switch' off"
-               cset "name='media1_out mix 0 media3_in Switch' off"
-
-               cset "name='pcm0_in Gain 0 Switch' on"
-               cset "name='pcm0_in Gain 0 Volume' 0"
-
-               cset "name='pcm1_in Gain 0 Switch' off"
-               cset "name='pcm1_in Gain 0 Volume' 0%"
-
-               # codec0_out settings (used if ssp2 is connected to aif1)
-               cset "name='codec_out0 mix 0 codec_in0 Switch' off"
-               cset "name='codec_out0 mix 0 codec_in1 Switch' off"
-               cset "name='codec_out0 mix 0 media_loop1_in Switch' off"
-               cset "name='codec_out0 mix 0 media_loop2_in Switch' off"
-               cset "name='codec_out0 mix 0 pcm0_in Switch' on"
-               cset "name='codec_out0 mix 0 pcm1_in Switch' off"
-               cset "name='codec_out0 mix 0 sprot_loop_in Switch' off"
-               cset "name='codec_out0 Gain 0 Switch' on"
-               cset "name='codec_out0 Gain 0 Volume' 0"
-
-               # modem_out settings (used if ssp0 is connected to aif2)
-               cset "name='modem_out mix 0 codec_in0 Switch' off"
-               cset "name='modem_out mix 0 codec_in1 Switch' off"
-               cset "name='modem_out mix 0 media_loop1_in Switch' off"
-               cset "name='modem_out mix 0 media_loop2_in Switch' off"
-               cset "name='modem_out mix 0 pcm0_in Switch' on"
-               cset "name='modem_out mix 0 pcm1_in Switch' off"
-               cset "name='modem_out mix 0 sprot_loop_in Switch' off"
-               cset "name='modem_out Gain 0 Switch' on"
-               cset "name='modem_out Gain 0 Volume' 0"
-
-               # input settings
-               # pcm1_out settings
-
-               # input used when SSP2 is connected
-               cset "name='codec_in0 Gain 0 Switch' on"
-               cset "name='codec_in0 Gain 0 Volume' 0"
-
-               # input used when SSP0 is connected
-               cset "name='modem_in Gain 0 Switch' on"
-               cset "name='modem_in Gain 0 Volume' 0"
-
-               cset "name='pcm1_out mix 0 codec_in0 Switch' on"
-               cset "name='pcm1_out mix 0 modem_in Switch' on"
-               cset "name='pcm1_out mix 0 codec_in1 Switch' off"
-               cset "name='pcm1_out mix 0 media_loop1_in Switch' off"
-               cset "name='pcm1_out mix 0 media_loop2_in Switch' off"
-               cset "name='pcm1_out mix 0 pcm0_in Switch' off"
-               cset "name='pcm1_out mix 0 pcm1_in Switch' off"
-               cset "name='pcm1_out mix 0 sprot_loop_in Switch' off"
-
-               cset "name='pcm1_out Gain 0 Switch' on"
-               cset "name='pcm1_out Gain 0 Volume' 0"
-
-               # disable codec_out1
-               cset "name='codec_out1 mix 0 codec_in0 Switch' off"
-               cset "name='codec_out1 mix 0 codec_in1 Switch' off"
-               cset "name='codec_out1 mix 0 media_loop1_in Switch' off"
-               cset "name='codec_out1 mix 0 media_loop2_in Switch' off"
-               cset "name='codec_out1 mix 0 pcm0_in Switch' off"
-               cset "name='codec_out1 mix 0 pcm1_in Switch' off"
-               cset "name='codec_out1 mix 0 sprot_loop_in Switch' off"
-               cset "name='codec_out1 Gain 0 Switch' off"
-               cset "name='codec_out1 Gain 0 Volume' 0%"
-
-               # disable codec_in1
-               cset "name='codec_in1 Gain 0 Switch' off"
-               cset "name='codec_in1 Gain 0 Volume' 0%"
-
-               # disable all loops
-               cset "name='media_loop1_out mix 0 codec_in0 Switch' off"
-               cset "name='media_loop1_out mix 0 codec_in1 Switch' off"
-               cset "name='media_loop1_out mix 0 media_loop1_in Switch' off"
-               cset "name='media_loop1_out mix 0 media_loop2_in Switch' off"
-               cset "name='media_loop1_out mix 0 pcm0_in Switch' off"
-               cset "name='media_loop1_out mix 0 pcm1_in Switch' off"
-               cset "name='media_loop1_out mix 0 sprot_loop_in Switch' off"
-
-               cset "name='media_loop2_out mix 0 codec_in0 Switch' off"
-               cset "name='media_loop2_out mix 0 codec_in1 Switch' off"
-               cset "name='media_loop2_out mix 0 media_loop1_in Switch' off"
-               cset "name='media_loop2_out mix 0 media_loop2_in Switch' off"
-               cset "name='media_loop2_out mix 0 pcm0_in Switch' off"
-               cset "name='media_loop2_out mix 0 pcm1_in Switch' off"
-               cset "name='media_loop2_out mix 0 sprot_loop_in Switch' off"
-
-               cset "name='sprot_loop_out mix 0 codec_in0 Switch' off"
-               cset "name='sprot_loop_out mix 0 codec_in1 Switch' off"
-               cset "name='sprot_loop_out mix 0 media_loop1_in Switch' off"
-               cset "name='sprot_loop_out mix 0 media_loop2_in Switch' off"
-               cset "name='sprot_loop_out mix 0 pcm0_in Switch' off"
-               cset "name='sprot_loop_out mix 0 pcm1_in Switch' off"
-               cset "name='sprot_loop_out mix 0 sprot_loop_in Switch' off"
+               <platforms/bytcr/PlatformEnableSeq.conf>
 
                # Output Configuration
                cset "name='DAC1 L Mux' IF1 DAC"

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 7a0cd51c0790fbf06dce1297a6dc16fe25624028..c4452a4e929002f1bc22f2b15162b480d85d9ab8 100644 (file)
--- a/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf
+++ b/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf
@@ -11,121 +11,7 @@ SectionVerb {
        EnableSequence [
                cdev "hw:chtrt5645"
 
-               # media mixer settings
-               #   compress
-               cset "name='media0_in Gain 0 Switch' on"
-               cset "name='media0_in Gain 0 Volume' 0"
-
-               #   normal
-               cset "name='media1_in Gain 0 Switch' on"
-               cset "name='media1_in Gain 0 Volume' 0"
-               #   swm loopback
-               cset "name='media2_in Gain 0 Switch' off"
-               cset "name='media2_in Gain 0 Volume' 0%"
-               #   deep buffer
-               cset "name='media3_in Gain 0 Switch' on"
-               cset "name='media3_in Gain 0 Volume' 0"
-
-               cset "name='media0_out mix 0 media0_in Switch' on"
-               cset "name='media0_out mix 0 media1_in Switch' on"
-               cset "name='media0_out mix 0 media2_in Switch' off"
-               cset "name='media0_out mix 0 media3_in Switch' on"
-
-               cset "name='media1_out mix 0 media0_in Switch' off"
-               cset "name='media1_out mix 0 media1_in Switch' off"
-               cset "name='media1_out mix 0 media2_in Switch' off"
-               cset "name='media1_out mix 0 media3_in Switch' off"
-
-               cset "name='pcm0_in Gain 0 Switch' on"
-               cset "name='pcm0_in Gain 0 Volume' 0"
-
-               cset "name='pcm1_in Gain 0 Switch' off"
-               cset "name='pcm1_in Gain 0 Volume' 0%"
-
-               # codec0_out settings (used if ssp2 is connected to aif1)
-               cset "name='codec_out0 mix 0 codec_in0 Switch' off"
-               cset "name='codec_out0 mix 0 codec_in1 Switch' off"
-               cset "name='codec_out0 mix 0 media_loop1_in Switch' off"
-               cset "name='codec_out0 mix 0 media_loop2_in Switch' off"
-               cset "name='codec_out0 mix 0 pcm0_in Switch' on"
-               cset "name='codec_out0 mix 0 pcm1_in Switch' off"
-               cset "name='codec_out0 mix 0 sprot_loop_in Switch' off"
-               cset "name='codec_out0 Gain 0 Switch' on"
-               cset "name='codec_out0 Gain 0 Volume' 0"
-
-               # modem_out settings (used if ssp0 is connected to aif2)
-               cset "name='modem_out mix 0 codec_in0 Switch' off"
-               cset "name='modem_out mix 0 codec_in1 Switch' off"
-               cset "name='modem_out mix 0 media_loop1_in Switch' off"
-               cset "name='modem_out mix 0 media_loop2_in Switch' off"
-               cset "name='modem_out mix 0 pcm0_in Switch' on"
-               cset "name='modem_out mix 0 pcm1_in Switch' off"
-               cset "name='modem_out mix 0 sprot_loop_in Switch' off"
-               cset "name='modem_out Gain 0 Switch' on"
-               cset "name='modem_out Gain 0 Volume' 0"
-
-               # input settings
-               # pcm1_out settings
-
-               # input used when SSP2 is connected
-               cset "name='codec_in0 Gain 0 Switch' on"
-               cset "name='codec_in0 Gain 0 Volume' 0"
-
-               # input used when SSP0 is connected
-               cset "name='modem_in Gain 0 Switch' on"
-               cset "name='modem_in Gain 0 Volume' 0"
-
-               cset "name='pcm1_out mix 0 codec_in0 Switch' on"
-               cset "name='pcm1_out mix 0 modem_in Switch' on"
-               cset "name='pcm1_out mix 0 codec_in1 Switch' off"
-               cset "name='pcm1_out mix 0 media_loop1_in Switch' off"
-               cset "name='pcm1_out mix 0 media_loop2_in Switch' off"
-               cset "name='pcm1_out mix 0 pcm0_in Switch' off"
-               cset "name='pcm1_out mix 0 pcm1_in Switch' off"
-               cset "name='pcm1_out mix 0 sprot_loop_in Switch' off"
-
-               cset "name='pcm1_out Gain 0 Switch' on"
-               cset "name='pcm1_out Gain 0 Volume' 0"
-
-               # disable codec_out1
-               cset "name='codec_out1 mix 0 codec_in0 Switch' off"
-               cset "name='codec_out1 mix 0 codec_in1 Switch' off"
-               cset "name='codec_out1 mix 0 media_loop1_in Switch' off"
-               cset "name='codec_out1 mix 0 media_loop2_in Switch' off"
-               cset "name='codec_out1 mix 0 pcm0_in Switch' off"
-               cset "name='codec_out1 mix 0 pcm1_in Switch' off"
-               cset "name='codec_out1 mix 0 sprot_loop_in Switch' off"
-               cset "name='codec_out1 Gain 0 Switch' off"
-               cset "name='codec_out1 Gain 0 Volume' 0%"
-
-               # disable codec_in1
-               cset "name='codec_in1 Gain 0 Switch' off"
-               cset "name='codec_in1 Gain 0 Volume' 0%"
-
-               # disable all loops
-               cset "name='media_loop1_out mix 0 codec_in0 Switch' off"
-               cset "name='media_loop1_out mix 0 codec_in1 Switch' off"
-               cset "name='media_loop1_out mix 0 media_loop1_in Switch' off"
-               cset "name='media_loop1_out mix 0 media_loop2_in Switch' off"
-               cset "name='media_loop1_out mix 0 pcm0_in Switch' off"
-               cset "name='media_loop1_out mix 0 pcm1_in Switch' off"
-               cset "name='media_loop1_out mix 0 sprot_loop_in Switch' off"
-
-               cset "name='media_loop2_out mix 0 codec_in0 Switch' off"
-               cset "name='media_loop2_out mix 0 codec_in1 Switch' off"
-               cset "name='media_loop2_out mix 0 media_loop1_in Switch' off"
-               cset "name='media_loop2_out mix 0 media_loop2_in Switch' off"
-               cset "name='media_loop2_out mix 0 pcm0_in Switch' off"
-               cset "name='media_loop2_out mix 0 pcm1_in Switch' off"
-               cset "name='media_loop2_out mix 0 sprot_loop_in Switch' off"
-
-               cset "name='sprot_loop_out mix 0 codec_in0 Switch' off"
-               cset "name='sprot_loop_out mix 0 codec_in1 Switch' off"
-               cset "name='sprot_loop_out mix 0 media_loop1_in Switch' off"
-               cset "name='sprot_loop_out mix 0 media_loop2_in Switch' off"
-               cset "name='sprot_loop_out mix 0 pcm0_in Switch' off"
-               cset "name='sprot_loop_out mix 0 pcm1_in Switch' off"
-               cset "name='sprot_loop_out mix 0 sprot_loop_in Switch' off"
+               <platforms/bytcr/PlatformEnableSeq.conf>
 
                # Output Configuration
                cset "name='DAC1 L Mux' IF1 DAC"

diff --git a/src/conf/ucm/platforms/bytcr/PlatformEnableSeq.conf b/src/conf/ucm/platforms/bytcr/PlatformEnableSeq.conf
index b5ee2b4158314d0e655070f24edff909c2eea4fd..6f5e899ce567a302f8204537ec8a7fdde99cb0f7 100644 (file)
--- a/src/conf/ucm/platforms/bytcr/PlatformEnableSeq.conf
+++ b/src/conf/ucm/platforms/bytcr/PlatformEnableSeq.conf
@@ -29,7 +29,7 @@ cset "name='pcm0_in Gain 0 Volume' 0"
 cset "name='pcm1_in Gain 0 Switch' off"
 cset "name='pcm1_in Gain 0 Volume' 0%"
 
-# codec0_out settings (used if SSP2 is connected)
+# codec0_out settings (used if SSP2 is connected to aif1)
 cset "name='codec_out0 mix 0 codec_in0 Switch' off"
 cset "name='codec_out0 mix 0 codec_in1 Switch' off"
 cset "name='codec_out0 mix 0 media_loop1_in Switch' off"
@@ -40,7 +40,7 @@ cset "name='codec_out0 mix 0 sprot_loop_in Switch' off"
 cset "name='codec_out0 Gain 0 Switch' on"
 cset "name='codec_out0 Gain 0 Volume' 0"
 
-# modem_out settings (used if SSP0 is connected)
+# modem_out settings (used if SSP0 is connected to aif2)
 cset "name='modem_out mix 0 codec_in0 Switch' off"
 cset "name='modem_out mix 0 codec_in1 Switch' off"
 cset "name='modem_out mix 0 media_loop1_in Switch' off"