cht-bsw-rt5672: adapt to ucm2

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm/cht-bsw-rt5672/HiFi.conf b/ucm2/cht-bsw-rt5672/HiFi.conf
similarity index 79%
rename from ucm/cht-bsw-rt5672/HiFi.conf
rename to ucm2/cht-bsw-rt5672/HiFi.conf
index b83099d825bf9f3343ad9d889019d3ca58accb2d..18c693283083ba5fd753de225867cbf39946228f 100644 (file)
--- a/ucm/cht-bsw-rt5672/HiFi.conf
+++ b/ucm2/cht-bsw-rt5672/HiFi.conf
@@ -2,19 +2,17 @@
 
 SectionVerb {
        EnableSequence [
-               cdev "hw:chtbswrt5672"
                <platforms/bytcr/PlatformEnableSeq.conf>
                <codecs/rt5672/EnableSeq.conf>
        ]
 
        DisableSequence [
-               cdev "hw:chtbswrt5672"
                <platforms/bytcr/PlatformDisableSeq.conf>
        ]
 
        Value {
-               PlaybackPCM "hw:chtbswrt5672"
-               CapturePCM "hw:chtbswrt5672"
+               PlaybackPCM "hw:${CardId}"
+               CapturePCM "hw:${CardId}"
        }
 }
 

diff --git a/ucm/cht-bsw-rt5672/cht-bsw-rt5672.conf b/ucm2/cht-bsw-rt5672/cht-bsw-rt5672.conf
similarity index 93%
rename from ucm/cht-bsw-rt5672/cht-bsw-rt5672.conf
rename to ucm2/cht-bsw-rt5672/cht-bsw-rt5672.conf
index c79024d98f60b4422a81be63fb462469bbf36f81..eb1f60a3d5e8a101fef3b04a69f20dcde6db8f89 100644 (file)
--- a/ucm/cht-bsw-rt5672/cht-bsw-rt5672.conf
+++ b/ucm2/cht-bsw-rt5672/cht-bsw-rt5672.conf
@@ -1,5 +1,7 @@
 # Adapted from https://github.com/plbossart/UCM/tree/master/cht-bsw-rt5672
 
+Syntax 2
+
 SectionUseCase."HiFi" {
        File "HiFi.conf"
        Comment "Play HiFi quality Music"

diff --git a/ucm/codecs/rt5672/DMIC1.conf b/ucm2/codecs/rt5672/DMIC1.conf
similarity index 91%
rename from ucm/codecs/rt5672/DMIC1.conf
rename to ucm2/codecs/rt5672/DMIC1.conf
index 9a8db1a5f08c46fd64af69dc39f762d5597e5aeb..b3da62780dd38637363baafdccb44521c3358942 100644 (file)
--- a/ucm/codecs/rt5672/DMIC1.conf
+++ b/ucm2/codecs/rt5672/DMIC1.conf
@@ -7,7 +7,6 @@ SectionDevice."DigitalMic-DMIC1" {
        ]
 
        EnableSequence [
-               cdev "hw:chtbswrt5672"
                cset "name='Int Mic Switch' on"
                cset "name='Stereo1 DMIC Mux' DMIC1"
                cset "name='Stereo1 ADC 2 Mux' DMIC"
@@ -16,7 +15,6 @@ SectionDevice."DigitalMic-DMIC1" {
        ]
 
        DisableSequence [
-               cdev "hw:chtbswrt5672"
                cset "name='Int Mic Switch' off"
                cset "name='Sto1 ADC MIXL ADC2 Switch' off"
                cset "name='Sto1 ADC MIXR ADC2 Switch' off"

diff --git a/ucm/codecs/rt5672/DMIC2.conf b/ucm2/codecs/rt5672/DMIC2.conf
similarity index 91%
rename from ucm/codecs/rt5672/DMIC2.conf
rename to ucm2/codecs/rt5672/DMIC2.conf
index b960436e174dafa6eddfa5f4966facfab74a4c4d..38fe015a9629bef16da433bdac0e2a423d72eb4e 100644 (file)
--- a/ucm/codecs/rt5672/DMIC2.conf
+++ b/ucm2/codecs/rt5672/DMIC2.conf
@@ -7,7 +7,6 @@ SectionDevice."DigitalMic-DMIC2" {
        ]
 
        EnableSequence [
-               cdev "hw:chtbswrt5672"
                cset "name='Int Mic Switch' on"
                cset "name='Stereo1 DMIC Mux' DMIC2"
                cset "name='Stereo1 ADC 2 Mux' DMIC"
@@ -16,7 +15,6 @@ SectionDevice."DigitalMic-DMIC2" {
        ]
 
        DisableSequence [
-               cdev "hw:chtbswrt5672"
                cset "name='Int Mic Switch' off"
                cset "name='Sto1 ADC MIXL ADC2 Switch' off"
                cset "name='Sto1 ADC MIXR ADC2 Switch' off"

diff --git a/ucm/codecs/rt5672/EnableSeq.conf b/ucm2/codecs/rt5672/EnableSeq.conf
similarity index 100%
rename from ucm/codecs/rt5672/EnableSeq.conf
rename to ucm2/codecs/rt5672/EnableSeq.conf

diff --git a/ucm/codecs/rt5672/HeadPhones.conf b/ucm2/codecs/rt5672/HeadPhones.conf
similarity index 85%
rename from ucm/codecs/rt5672/HeadPhones.conf
rename to ucm2/codecs/rt5672/HeadPhones.conf
index cb8aad2df5fa2dc607356cf9101f8c1e7e4def25..350fb2b4ed73f67f3668a85693e0fc9622e0130f 100644 (file)
--- a/ucm/codecs/rt5672/HeadPhones.conf
+++ b/ucm2/codecs/rt5672/HeadPhones.conf
@@ -7,12 +7,10 @@ SectionDevice."Headphones" {
        ]
 
        EnableSequence [
-               cdev "hw:chtbswrt5672"
                cset "name='Headphone Switch' on"
        ]
 
        DisableSequence [
-               cdev "hw:chtbswrt5672"
                cset "name='Headphone Switch' off"
        ]
 

diff --git a/ucm/codecs/rt5672/HeadsetMic.conf b/ucm2/codecs/rt5672/HeadsetMic.conf
similarity index 95%
rename from ucm/codecs/rt5672/HeadsetMic.conf
rename to ucm2/codecs/rt5672/HeadsetMic.conf
index cc6d8d56d39f7d85747a9b2cab2dbb93bfdee4a0..fd02cb3a676aa9ba8de182bc919232d5dfd3fa17 100644 (file)
--- a/ucm/codecs/rt5672/HeadsetMic.conf
+++ b/ucm2/codecs/rt5672/HeadsetMic.conf
@@ -7,7 +7,6 @@ SectionDevice."HeadsetMic" {
        ]
 
        EnableSequence [
-               cdev "hw:chtbswrt5672"
                cset "name='Headset Mic Switch' on"
                cset "name='RECMIXL BST1 Switch' on"
                cset "name='RECMIXR BST1 Switch' on"
@@ -21,7 +20,6 @@ SectionDevice."HeadsetMic" {
        ]
 
        DisableSequence [
-               cdev "hw:chtbswrt5672"
                cset "name='Headset Mic Switch' off"
                cset "name='RECMIXL BST1 Switch' off"
                cset "name='RECMIXR BST1 Switch' off"

diff --git a/ucm/codecs/rt5672/MonoSpeaker.conf b/ucm2/codecs/rt5672/MonoSpeaker.conf
similarity index 90%
rename from ucm/codecs/rt5672/MonoSpeaker.conf
rename to ucm2/codecs/rt5672/MonoSpeaker.conf
index 828a1154d7e7d6e1b2f63a6b62c7ec2c9506180a..6308ad953c7fbf23e098f4f372fbcd1278df7d18 100644 (file)
--- a/ucm/codecs/rt5672/MonoSpeaker.conf
+++ b/ucm2/codecs/rt5672/MonoSpeaker.conf
@@ -7,14 +7,12 @@ SectionDevice."MonoSpeaker" {
        ]
 
        EnableSequence [
-               cdev "hw:chtbswrt5672"
                cset "name='Stereo DAC MIXR DAC R1 Switch' off"
                cset "name='Stereo DAC MIXL DAC R1 Switch' on"
                cset "name='Ext Spk Switch' on"
        ]
 
        DisableSequence [
-               cdev "hw:chtbswrt5672"
                cset "name='Ext Spk Switch' off"
                cset "name='Stereo DAC MIXL DAC R1 Switch' off"
                cset "name='Stereo DAC MIXR DAC R1 Switch' on"

diff --git a/ucm/codecs/rt5672/Speaker.conf b/ucm2/codecs/rt5672/Speaker.conf
similarity index 83%
rename from ucm/codecs/rt5672/Speaker.conf
rename to ucm2/codecs/rt5672/Speaker.conf
index f9291e5347b3de567e01ad123f936fc5c2db17a7..e4391ccca589bf62f8d39acc7f8ec728a606a332 100644 (file)
--- a/ucm/codecs/rt5672/Speaker.conf
+++ b/ucm2/codecs/rt5672/Speaker.conf
@@ -7,12 +7,10 @@ SectionDevice."Speaker" {
        ]
 
        EnableSequence [
-               cdev "hw:chtbswrt5672"
                cset "name='Ext Spk Switch' on"
        ]
 
        DisableSequence [
-               cdev "hw:chtbswrt5672"
                cset "name='Ext Spk Switch' off"
        ]