From 521c6c3e210a55e11221594024f1ce1346f29150 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 21 Nov 2019 13:36:50 +0100 Subject: [PATCH] bytcht-cx2072x: adapt to ucm2 Signed-off-by: Jaroslav Kysela --- {ucm => ucm2}/bytcht-cx2072x/HiFi.conf | 6 ++---- {ucm => ucm2}/bytcht-cx2072x/bytcht-cx2072x.conf | 6 ++---- {ucm => ucm2}/codecs/cx2072x/DisableSeq.conf | 0 {ucm => ucm2}/codecs/cx2072x/EnableSeq.conf | 0 {ucm => ucm2}/codecs/cx2072x/HeadPhones.conf | 2 -- {ucm => ucm2}/codecs/cx2072x/HeadsetMic.conf | 2 -- {ucm => ucm2}/codecs/cx2072x/InternalMic.conf | 2 -- {ucm => ucm2}/codecs/cx2072x/Speaker.conf | 2 -- 8 files changed, 4 insertions(+), 16 deletions(-) rename {ucm => ucm2}/bytcht-cx2072x/HiFi.conf (75%) rename {ucm => ucm2}/bytcht-cx2072x/bytcht-cx2072x.conf (64%) rename {ucm => ucm2}/codecs/cx2072x/DisableSeq.conf (100%) rename {ucm => ucm2}/codecs/cx2072x/EnableSeq.conf (100%) rename {ucm => ucm2}/codecs/cx2072x/HeadPhones.conf (87%) rename {ucm => ucm2}/codecs/cx2072x/HeadsetMic.conf (88%) rename {ucm => ucm2}/codecs/cx2072x/InternalMic.conf (87%) rename {ucm => ucm2}/codecs/cx2072x/Speaker.conf (85%) diff --git a/ucm/bytcht-cx2072x/HiFi.conf b/ucm2/bytcht-cx2072x/HiFi.conf similarity index 75% rename from ucm/bytcht-cx2072x/HiFi.conf rename to ucm2/bytcht-cx2072x/HiFi.conf index e9c1f75..60e0229 100644 --- a/ucm/bytcht-cx2072x/HiFi.conf +++ b/ucm2/bytcht-cx2072x/HiFi.conf @@ -1,19 +1,17 @@ SectionVerb { EnableSequence [ - cdev "hw:bytchtcx2072x" ] DisableSequence [ - cdev "hw:bytchtcx2072x" ] Value { - PlaybackPCM "hw:bytchtcx2072x" - CapturePCM "hw:bytchtcx2072x" + PlaybackPCM "hw:${CardId}" + CapturePCM "hw:${CardId}" } } diff --git a/ucm/bytcht-cx2072x/bytcht-cx2072x.conf b/ucm2/bytcht-cx2072x/bytcht-cx2072x.conf similarity index 64% rename from ucm/bytcht-cx2072x/bytcht-cx2072x.conf rename to ucm2/bytcht-cx2072x/bytcht-cx2072x.conf index fce0445..d7a0518 100644 --- a/ucm/bytcht-cx2072x/bytcht-cx2072x.conf +++ b/ucm2/bytcht-cx2072x/bytcht-cx2072x.conf @@ -1,8 +1,6 @@ +Syntax 2 + SectionUseCase."HiFi" { File "HiFi.conf" Comment "Play HiFi quality Music" } - -SectionDefaults [ - cdev "hw:bytchtcx2072x" -] diff --git a/ucm/codecs/cx2072x/DisableSeq.conf b/ucm2/codecs/cx2072x/DisableSeq.conf similarity index 100% rename from ucm/codecs/cx2072x/DisableSeq.conf rename to ucm2/codecs/cx2072x/DisableSeq.conf diff --git a/ucm/codecs/cx2072x/EnableSeq.conf b/ucm2/codecs/cx2072x/EnableSeq.conf similarity index 100% rename from ucm/codecs/cx2072x/EnableSeq.conf rename to ucm2/codecs/cx2072x/EnableSeq.conf diff --git a/ucm/codecs/cx2072x/HeadPhones.conf b/ucm2/codecs/cx2072x/HeadPhones.conf similarity index 87% rename from ucm/codecs/cx2072x/HeadPhones.conf rename to ucm2/codecs/cx2072x/HeadPhones.conf index 4e3ff95..b5d3d3a 100644 --- a/ucm/codecs/cx2072x/HeadPhones.conf +++ b/ucm2/codecs/cx2072x/HeadPhones.conf @@ -6,13 +6,11 @@ SectionDevice."Headphones" { ] EnableSequence [ - cdev "hw:bytchtcx2072x" cset "name='Headphone Switch' on" cset "name='PortA Out En Switch' on" ] DisableSequence [ - cdev "hw:bytchtcx2072x" cset "name='Headphone Switch' off" cset "name='PortA Out En Switch' off" ] diff --git a/ucm/codecs/cx2072x/HeadsetMic.conf b/ucm2/codecs/cx2072x/HeadsetMic.conf similarity index 88% rename from ucm/codecs/cx2072x/HeadsetMic.conf rename to ucm2/codecs/cx2072x/HeadsetMic.conf index 26b8df1..0a59750 100644 --- a/ucm/codecs/cx2072x/HeadsetMic.conf +++ b/ucm2/codecs/cx2072x/HeadsetMic.conf @@ -6,14 +6,12 @@ SectionDevice."HeadsetMic" { ] EnableSequence [ - cdev "hw:bytchtcx2072x" cset "name='Headset Mic Switch' on" cset "name='ADC1 Mux' 'PortD Switch'" cset "name='PortD In En Switch' on" ] DisableSequence [ - cdev "hw:bytchtcx2072x" cset "name='Headset Mic Switch' off" cset "name='PortD In En Switch' off" ] diff --git a/ucm/codecs/cx2072x/InternalMic.conf b/ucm2/codecs/cx2072x/InternalMic.conf similarity index 87% rename from ucm/codecs/cx2072x/InternalMic.conf rename to ucm2/codecs/cx2072x/InternalMic.conf index a3e1453..e358c35 100644 --- a/ucm/codecs/cx2072x/InternalMic.conf +++ b/ucm2/codecs/cx2072x/InternalMic.conf @@ -6,14 +6,12 @@ SectionDevice."InternalMic" { ] EnableSequence [ - cdev "hw:bytchtcx2072x" cset "name='Int Mic Switch' on" cset "name='ADC1 Mux' 'PortC Switch'" cset "name='PortC In En Switch' on" ] DisableSequence [ - cdev "hw:bytchtcx2072x" cset "name='Int Mic Switch' off" cset "name='PortC In En Switch' off" ] diff --git a/ucm/codecs/cx2072x/Speaker.conf b/ucm2/codecs/cx2072x/Speaker.conf similarity index 85% rename from ucm/codecs/cx2072x/Speaker.conf rename to ucm2/codecs/cx2072x/Speaker.conf index 55e2b2b..a83aeae 100644 --- a/ucm/codecs/cx2072x/Speaker.conf +++ b/ucm2/codecs/cx2072x/Speaker.conf @@ -6,13 +6,11 @@ SectionDevice."Speaker" { ] EnableSequence [ - cdev "hw:bytchtcx2072x" cset "name='Ext Spk Switch' on" cset "name='PortG Out En Switch' on" ] DisableSequence [ - cdev "hw:bytchtcx2072x" cset "name='Ext Spk Switch' off" cset "name='PortG Out En Switch' off" ] -- 2.47.1