From 9d797e49b4d8ef8d1bc94561926506250a6fffe4 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 21 Nov 2019 13:51:58 +0100 Subject: [PATCH] cht-bsw-rt5672: adapt to ucm2 Signed-off-by: Jaroslav Kysela --- {ucm => ucm2}/cht-bsw-rt5672/HiFi.conf | 6 ++---- {ucm => ucm2}/cht-bsw-rt5672/cht-bsw-rt5672.conf | 2 ++ {ucm => ucm2}/codecs/rt5672/DMIC1.conf | 2 -- {ucm => ucm2}/codecs/rt5672/DMIC2.conf | 2 -- {ucm => ucm2}/codecs/rt5672/EnableSeq.conf | 0 {ucm => ucm2}/codecs/rt5672/HeadPhones.conf | 2 -- {ucm => ucm2}/codecs/rt5672/HeadsetMic.conf | 2 -- {ucm => ucm2}/codecs/rt5672/MonoSpeaker.conf | 2 -- {ucm => ucm2}/codecs/rt5672/Speaker.conf | 2 -- 9 files changed, 4 insertions(+), 16 deletions(-) rename {ucm => ucm2}/cht-bsw-rt5672/HiFi.conf (79%) rename {ucm => ucm2}/cht-bsw-rt5672/cht-bsw-rt5672.conf (93%) rename {ucm => ucm2}/codecs/rt5672/DMIC1.conf (91%) rename {ucm => ucm2}/codecs/rt5672/DMIC2.conf (91%) rename {ucm => ucm2}/codecs/rt5672/EnableSeq.conf (100%) rename {ucm => ucm2}/codecs/rt5672/HeadPhones.conf (85%) rename {ucm => ucm2}/codecs/rt5672/HeadsetMic.conf (95%) rename {ucm => ucm2}/codecs/rt5672/MonoSpeaker.conf (90%) rename {ucm => ucm2}/codecs/rt5672/Speaker.conf (83%) 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 b83099d..18c6932 100644 --- a/ucm/cht-bsw-rt5672/HiFi.conf +++ b/ucm2/cht-bsw-rt5672/HiFi.conf @@ -2,19 +2,17 @@ SectionVerb { EnableSequence [ - cdev "hw:chtbswrt5672" ] DisableSequence [ - cdev "hw:chtbswrt5672" ] 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 c79024d..eb1f60a 100644 --- 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 9a8db1a..b3da627 100644 --- 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 b960436..38fe015 100644 --- 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 cb8aad2..350fb2b 100644 --- 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 cc6d8d5..fd02cb3 100644 --- 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 828a115..6308ad9 100644 --- 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 f9291e5..e4391cc 100644 --- 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" ] -- 2.47.1