bytcht-cx2072x: adapt to ucm2

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

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 e9c1f7573d50c76ef47653032545254c326e706c..60e022974790677a7371d45ffe4d30cf456c8141 100644 (file)
--- a/ucm/bytcht-cx2072x/HiFi.conf
+++ b/ucm2/bytcht-cx2072x/HiFi.conf
@@ -1,19 +1,17 @@
 SectionVerb {
        EnableSequence [
-               cdev "hw:bytchtcx2072x"
                <platforms/bytcr/PlatformEnableSeq.conf>
                <codecs/cx2072x/EnableSeq.conf>
        ]
 
        DisableSequence [
-               cdev "hw:bytchtcx2072x"
                <codecs/cx2072x/DisableSeq.conf>
                <platforms/bytcr/PlatformDisableSeq.conf>
        ]
 
        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 fce04456c678ddec49beeb78b25176d4a2d9c0de..d7a0518169fccf20840d6d569df2539fa9f926d4 100644 (file)
--- 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 4e3ff950c130442b7e877364b93db7cb2cab04d4..b5d3d3a15402b6fffa76dc81f6daffe1cac8fcf5 100644 (file)
--- 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 26b8df1603851d9da73232ffd378c278a4f894cd..0a59750f8f4a437092e307c9dac056984ac887d4 100644 (file)
--- 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 a3e14538fe5892b72dcb9e0dfb832f5c6ef62d82..e358c35c1847b8328092697222cd04a0b965ac79 100644 (file)
--- 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 55e2b2ba33e4b773c1e35704d6378b40ea0ca3ee..a83aeae9a1d3f2c3eea9a255d45da9a01859c595 100644 (file)
--- 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"
        ]