bytcr-rt5651: adapt to ucm2

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

diff --git a/ucm/bytcr-rt5651-mono-spk-in1-mic/HiFi.conf b/ucm/bytcr-rt5651-mono-spk-in1-mic/HiFi.conf
deleted file mode 100644 (file)
index b93e0be..0000000
--- a/ucm/bytcr-rt5651-mono-spk-in1-mic/HiFi.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
-
-
-SectionVerb {
-       EnableSequence [
-               cdev "hw:bytcrrt5651"
-               <platforms/bytcr/PlatformEnableSeq.conf>
-               <codecs/rt5651/EnableSeq.conf>
-       ]
-
-       DisableSequence [
-               cdev "hw:bytcrrt5651"
-               <platforms/bytcr/PlatformDisableSeq.conf>
-       ]
-
-       Value {
-               PlaybackPCM "hw:bytcrrt5651"
-               CapturePCM "hw:bytcrrt5651"
-       }
-}
-
-<codecs/rt5651/MonoSpeaker.conf>
-<codecs/rt5651/HeadPhones.conf>
-
-<codecs/rt5651/IN1-InternalMic.conf>
-<codecs/rt5651/IN3-HeadsetMic.conf>

diff --git a/ucm/bytcr-rt5651-mono-spk-in1-mic/bytcr-rt5651-mono-spk-in1-mic.conf b/ucm/bytcr-rt5651-mono-spk-in1-mic/bytcr-rt5651-mono-spk-in1-mic.conf
deleted file mode 100644 (file)
index a2f584e..0000000
--- a/ucm/bytcr-rt5651-mono-spk-in1-mic/bytcr-rt5651-mono-spk-in1-mic.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
-
-SectionUseCase."HiFi" {
-       File "../bytcr-rt5651-mono-spk-in1-mic/HiFi.conf"
-       Comment "Play HiFi quality Music"
-}
-
-SectionDefaults [
-       cdev "hw:bytcrrt5651"
-]

diff --git a/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf b/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf
deleted file mode 100644 (file)
index ef04862..0000000
--- a/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
-
-
-SectionVerb {
-       EnableSequence [
-               cdev "hw:bytcrrt5651"
-               <platforms/bytcr/PlatformEnableSeq.conf>
-               <codecs/rt5651/EnableSeq.conf>
-       ]
-
-       DisableSequence [
-               cdev "hw:bytcrrt5651"
-               <platforms/bytcr/PlatformDisableSeq.conf>
-       ]
-
-       Value {
-               PlaybackPCM "hw:bytcrrt5651"
-               CapturePCM "hw:bytcrrt5651"
-       }
-}
-
-<codecs/rt5651/MonoSpeaker.conf>
-<codecs/rt5651/HeadPhones-swapped.conf>
-
-<codecs/rt5651/IN2-InternalMic.conf>
-<codecs/rt5651/IN3-HeadsetMic.conf>

diff --git a/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/bytcr-rt5651-mono-spk-in2-mic-hp-swapped.conf b/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/bytcr-rt5651-mono-spk-in2-mic-hp-swapped.conf
deleted file mode 100644 (file)
index 916fbc1..0000000
--- a/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/bytcr-rt5651-mono-spk-in2-mic-hp-swapped.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
-
-SectionUseCase."HiFi" {
-       File "../bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf"
-       Comment "Play HiFi quality Music"
-}
-
-SectionDefaults [
-       cdev "hw:bytcrrt5651"
-]

diff --git a/ucm/bytcr-rt5651-mono-spk-in2-mic/HiFi.conf b/ucm/bytcr-rt5651-mono-spk-in2-mic/HiFi.conf
deleted file mode 100644 (file)
index c324c14..0000000
--- a/ucm/bytcr-rt5651-mono-spk-in2-mic/HiFi.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
-
-
-SectionVerb {
-       EnableSequence [
-               cdev "hw:bytcrrt5651"
-               <platforms/bytcr/PlatformEnableSeq.conf>
-               <codecs/rt5651/EnableSeq.conf>
-       ]
-
-       DisableSequence [
-               cdev "hw:bytcrrt5651"
-               <platforms/bytcr/PlatformDisableSeq.conf>
-       ]
-
-       Value {
-               PlaybackPCM "hw:bytcrrt5651"
-               CapturePCM "hw:bytcrrt5651"
-       }
-}
-
-<codecs/rt5651/MonoSpeaker.conf>
-<codecs/rt5651/HeadPhones.conf>
-
-<codecs/rt5651/IN2-InternalMic.conf>
-<codecs/rt5651/IN3-HeadsetMic.conf>

diff --git a/ucm/bytcr-rt5651-mono-spk-in2-mic/bytcr-rt5651-mono-spk-in2-mic.conf b/ucm/bytcr-rt5651-mono-spk-in2-mic/bytcr-rt5651-mono-spk-in2-mic.conf
deleted file mode 100644 (file)
index 4ad36ec..0000000
--- a/ucm/bytcr-rt5651-mono-spk-in2-mic/bytcr-rt5651-mono-spk-in2-mic.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
-
-SectionUseCase."HiFi" {
-       File "../bytcr-rt5651-mono-spk-in2-mic/HiFi.conf"
-       Comment "Play HiFi quality Music"
-}
-
-SectionDefaults [
-       cdev "hw:bytcrrt5651"
-]

diff --git a/ucm/bytcr-rt5651-stereo-spk-dmic-mic/HiFi.conf b/ucm/bytcr-rt5651-stereo-spk-dmic-mic/HiFi.conf
deleted file mode 100644 (file)
index abf5fc7..0000000
--- a/ucm/bytcr-rt5651-stereo-spk-dmic-mic/HiFi.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
-
-
-SectionVerb {
-       EnableSequence [
-               cdev "hw:bytcrrt5651"
-               <platforms/bytcr/PlatformEnableSeq.conf>
-               <codecs/rt5651/EnableSeq.conf>
-       ]
-
-       DisableSequence [
-               cdev "hw:bytcrrt5651"
-               <platforms/bytcr/PlatformDisableSeq.conf>
-       ]
-
-       Value {
-               PlaybackPCM "hw:bytcrrt5651"
-               CapturePCM "hw:bytcrrt5651"
-       }
-}
-
-<codecs/rt5651/Speaker.conf>
-<codecs/rt5651/HeadPhones.conf>
-
-<codecs/rt5651/DigitalMic.conf>
-<codecs/rt5651/IN2-HeadsetMic.conf>

diff --git a/ucm/bytcr-rt5651-stereo-spk-dmic-mic/bytcr-rt5651-stereo-spk-dmic-mic.conf b/ucm/bytcr-rt5651-stereo-spk-dmic-mic/bytcr-rt5651-stereo-spk-dmic-mic.conf
deleted file mode 100644 (file)
index de8d954..0000000
--- a/ucm/bytcr-rt5651-stereo-spk-dmic-mic/bytcr-rt5651-stereo-spk-dmic-mic.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
-
-SectionUseCase."HiFi" {
-       File "../bytcr-rt5651-stereo-spk-dmic-mic/HiFi.conf"
-       Comment "Play HiFi quality Music"
-}
-
-SectionDefaults [
-       cdev "hw:bytcrrt5651"
-]

diff --git a/ucm/bytcr-rt5651-stereo-spk-in1-mic/HiFi.conf b/ucm/bytcr-rt5651-stereo-spk-in1-mic/HiFi.conf
deleted file mode 100644 (file)
index aa1a1cd..0000000
--- a/ucm/bytcr-rt5651-stereo-spk-in1-mic/HiFi.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
-
-
-SectionVerb {
-       EnableSequence [
-               cdev "hw:bytcrrt5651"
-               <platforms/bytcr/PlatformEnableSeq.conf>
-               <codecs/rt5651/EnableSeq.conf>
-       ]
-
-       DisableSequence [
-               cdev "hw:bytcrrt5651"
-               <platforms/bytcr/PlatformDisableSeq.conf>
-       ]
-
-       Value {
-               PlaybackPCM "hw:bytcrrt5651"
-               CapturePCM "hw:bytcrrt5651"
-       }
-}
-
-<codecs/rt5651/Speaker.conf>
-<codecs/rt5651/HeadPhones.conf>
-
-<codecs/rt5651/IN1-InternalMic.conf>
-<codecs/rt5651/IN3-HeadsetMic.conf>

diff --git a/ucm/bytcr-rt5651-stereo-spk-in1-mic/bytcr-rt5651-stereo-spk-in1-mic.conf b/ucm/bytcr-rt5651-stereo-spk-in1-mic/bytcr-rt5651-stereo-spk-in1-mic.conf
deleted file mode 100644 (file)
index 40d871b..0000000
--- a/ucm/bytcr-rt5651-stereo-spk-in1-mic/bytcr-rt5651-stereo-spk-in1-mic.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
-
-SectionUseCase."HiFi" {
-       File "../bytcr-rt5651-stereo-spk-in1-mic/HiFi.conf"
-       Comment "Play HiFi quality Music"
-}
-
-SectionDefaults [
-       cdev "hw:bytcrrt5651"
-]

diff --git a/ucm/bytcr-rt5651-stereo-spk-in12-mic/HiFi.conf b/ucm/bytcr-rt5651-stereo-spk-in12-mic/HiFi.conf
deleted file mode 100644 (file)
index 343aed2..0000000
--- a/ucm/bytcr-rt5651-stereo-spk-in12-mic/HiFi.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
-
-
-SectionVerb {
-       EnableSequence [
-               cdev "hw:bytcrrt5651"
-               <platforms/bytcr/PlatformEnableSeq.conf>
-               <codecs/rt5651/EnableSeq.conf>
-       ]
-
-       DisableSequence [
-               cdev "hw:bytcrrt5651"
-               <platforms/bytcr/PlatformDisableSeq.conf>
-       ]
-
-       Value {
-               PlaybackPCM "hw:bytcrrt5651"
-               CapturePCM "hw:bytcrrt5651"
-       }
-}
-
-<codecs/rt5651/Speaker.conf>
-<codecs/rt5651/HeadPhones.conf>
-
-<codecs/rt5651/IN12-InternalMic.conf>
-<codecs/rt5651/IN3-HeadsetMic.conf>

diff --git a/ucm/bytcr-rt5651-stereo-spk-in12-mic/bytcr-rt5651-stereo-spk-in12-mic.conf b/ucm/bytcr-rt5651-stereo-spk-in12-mic/bytcr-rt5651-stereo-spk-in12-mic.conf
deleted file mode 100644 (file)
index 56bf3f0..0000000
--- a/ucm/bytcr-rt5651-stereo-spk-in12-mic/bytcr-rt5651-stereo-spk-in12-mic.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
-
-SectionUseCase."HiFi" {
-       File "../bytcr-rt5651-stereo-spk-in12-mic/HiFi.conf"
-       Comment "Play HiFi quality Music"
-}
-
-SectionDefaults [
-       cdev "hw:bytcrrt5651"
-]

diff --git a/ucm/bytcr-rt5651-stereo-spk-in2-mic/bytcr-rt5651-stereo-spk-in2-mic.conf b/ucm/bytcr-rt5651-stereo-spk-in2-mic/bytcr-rt5651-stereo-spk-in2-mic.conf
deleted file mode 100644 (file)
index 84e86e4..0000000
--- a/ucm/bytcr-rt5651-stereo-spk-in2-mic/bytcr-rt5651-stereo-spk-in2-mic.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
-
-SectionUseCase."HiFi" {
-       File "../bytcr-rt5651-stereo-spk-in2-mic/HiFi.conf"
-       Comment "Play HiFi quality Music"
-}
-
-SectionDefaults [
-       cdev "hw:bytcrrt5651"
-]

diff --git a/ucm/bytcr-rt5651/HiFi.conf b/ucm/bytcr-rt5651/HiFi.conf
deleted file mode 100644 (file)
index 8fcc5a8..0000000
--- a/ucm/bytcr-rt5651/HiFi.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
-
-
-SectionVerb {
-       EnableSequence [
-               cdev "hw:bytcrrt5651"
-               <platforms/bytcr/PlatformEnableSeq.conf>
-               <codecs/rt5651/EnableSeq.conf>
-       ]
-
-       DisableSequence [
-               cdev "hw:bytcrrt5651"
-               <platforms/bytcr/PlatformDisableSeq.conf>
-       ]
-
-       Value {
-               PlaybackPCM "hw:bytcrrt5651"
-               CapturePCM "hw:bytcrrt5651"
-       }
-}
-
-<codecs/rt5651/Speaker.conf>
-<codecs/rt5651/MonoSpeaker.conf>
-<codecs/rt5651/HeadPhones.conf>
-
-<codecs/rt5651/DigitalMic.conf>
-<codecs/rt5651/IN1-InternalMic.conf>
-<codecs/rt5651/IN2-InternalMic.conf>
-<codecs/rt5651/IN12-InternalMic.conf>
-<codecs/rt5651/IN2-HeadsetMic.conf>
-<codecs/rt5651/IN3-HeadsetMic.conf>

diff --git a/ucm2/bytcr-rt5651/HiFi-Components.conf b/ucm2/bytcr-rt5651/HiFi-Components.conf
new file mode 100644 (file)
index 0000000..235838e
--- /dev/null
+++ b/ucm2/bytcr-rt5651/HiFi-Components.conf
@@ -0,0 +1,81 @@
+If.spk {
+       Condition {
+               Type String
+               Haystack "${CardComponents}"
+               Needle "cfg-spk:2"
+       }
+       True {
+               <codecs/rt5651/Speaker.conf>
+       }
+}
+
+If.mono {
+       Condition {
+               Type String
+               Haystack "${CardComponents}"
+               Needle "cfg-spk:1"
+       }
+       True {
+               <codecs/rt5651/MonoSpeaker.conf>
+       }
+}
+
+If.headphones {
+       Condition {
+               Type String
+               Haystack "${CardComponents}"
+               Needle "cfg-hp:lrswap"
+       }
+       True {
+               <codecs/rt5651/HeadPhones-swapped.conf>
+       }
+       False {
+               <codecs/rt5651/HeadPhones.conf>
+       }
+}
+
+If.dmic1 {
+       Condition {
+               Type String
+               Haystack "${CardComponents}"
+               Needle "cfg-mic:dmic1"
+       }
+       True {
+               <codecs/rt5651/DigitalMic.conf>
+       }
+}
+
+If.in1 {
+       Condition {
+               Type String
+               Haystack "${CardComponents}"
+               Needle "cfg-mic:in1"
+       }
+       True {
+               <codecs/rt5651/IN1-InternalMic.conf>
+       }
+}
+
+If.in2 {
+       Condition {
+               Type String
+               Haystack "${CardComponents}"
+               Needle "cfg-mic:in2"
+       }
+       True {
+               <codecs/rt5651/IN2-InternalMic.conf>
+       }
+}
+
+If.in12 {
+       Condition {
+               Type String
+               Haystack "${CardComponents}"
+               Needle "cfg-mic:in12"
+       }
+       True {
+               <codecs/rt5651/IN12-InternalMic.conf>
+       }
+}
+
+<codecs/rt5651/IN3-HeadsetMic.conf>

diff --git a/ucm2/bytcr-rt5651/HiFi-LongName.conf b/ucm2/bytcr-rt5651/HiFi-LongName.conf
new file mode 100644 (file)
index 0000000..58eb722
--- /dev/null
+++ b/ucm2/bytcr-rt5651/HiFi-LongName.conf
@@ -0,0 +1,81 @@
+If.spk {
+       Condition {
+               Type String
+               Haystack "${CardLongName}"
+               Needle "-stereo-spk"
+       }
+       True {
+               <codecs/rt5651/Speaker.conf>
+       }
+}
+
+If.mono {
+       Condition {
+               Type String
+               Haystack "${CardLongName}"
+               Needle "-mono-spk"
+       }
+       True {
+               <codecs/rt5651/MonoSpeaker.conf>
+       }
+}
+
+If.headphones {
+       Condition {
+               Type String
+               Haystack "${CardLongName}"
+               Needle "-mic-hp-swapped"
+       }
+       True {
+               <codecs/rt5651/HeadPhones-swapped.conf>
+       }
+       False {
+               <codecs/rt5651/HeadPhones.conf>
+       }
+}
+
+If.dmic1 {
+       Condition {
+               Type String
+               Haystack "${CardLongName}"
+               Needle "-dmic1-mic"
+       }
+       True {
+               <codecs/rt5651/DigitalMic.conf>
+       }
+}
+
+If.in1 {
+       Condition {
+               Type String
+               Haystack "${CardLongName}"
+               Needle "-in1-mic"
+       }
+       True {
+               <codecs/rt5651/IN1-InternalMic.conf>
+       }
+}
+
+If.in2 {
+       Condition {
+               Type String
+               Haystack "${CardLongName}"
+               Needle "-in2-mic"
+       }
+       True {
+               <codecs/rt5651/IN2-InternalMic.conf>
+       }
+}
+
+If.in12 {
+       Condition {
+               Type String
+               Haystack "${CardLongName}"
+               Needle "-in12-mic"
+       }
+       True {
+               <codecs/rt5651/IN12-InternalMic.conf>
+       }
+}
+
+<codecs/rt5651/IN3-HeadsetMic.conf>

diff --git a/ucm/bytcr-rt5651-stereo-spk-in2-mic/HiFi.conf b/ucm2/bytcr-rt5651/HiFi.conf
similarity index 52%
rename from ucm/bytcr-rt5651-stereo-spk-in2-mic/HiFi.conf
rename to ucm2/bytcr-rt5651/HiFi.conf
index 6f6d74cf2e68cd9846707f905e9e41622099aea7..1f031f25e87299685f961efcde8cd9160b236240 100644 (file)
--- a/ucm/bytcr-rt5651-stereo-spk-in2-mic/HiFi.conf
+++ b/ucm2/bytcr-rt5651/HiFi.conf
@@ -3,24 +3,30 @@
 
 SectionVerb {
        EnableSequence [
-               cdev "hw:bytcrrt5651"
                <platforms/bytcr/PlatformEnableSeq.conf>
                <codecs/rt5651/EnableSeq.conf>
        ]
 
        DisableSequence [
-               cdev "hw:bytcrrt5651"
                <platforms/bytcr/PlatformDisableSeq.conf>
        ]
 
        Value {
-               PlaybackPCM "hw:bytcrrt5651"
-               CapturePCM "hw:bytcrrt5651"
+               PlaybackPCM "hw:${CardId}"
+               CapturePCM "hw:${CardId}"
        }
 }
 
-<codecs/rt5651/Speaker.conf>
-<codecs/rt5651/HeadPhones.conf>
-
-<codecs/rt5651/IN2-InternalMic.conf>
-<codecs/rt5651/IN3-HeadsetMic.conf>
+If.0 {
+       Condition {
+               Type String
+               Haystack "${CardComponents}"
+               Needle "cfg-spk:"
+       }
+       True {
+               <bytcr-rt5651/HiFi-Components.conf>
+       }
+       False {
+               <bytcr-rt5651/HiFi-LongName.conf>
+       }
+}

diff --git a/ucm/bytcr-rt5651/bytcr-rt5651.conf b/ucm2/bytcr-rt5651/bytcr-rt5651.conf
similarity index 78%
rename from ucm/bytcr-rt5651/bytcr-rt5651.conf
rename to ucm2/bytcr-rt5651/bytcr-rt5651.conf
index 45889d82ef474ccdc0c0700322e8294058a6f9be..64888bab8c4270ea30eb4f7ec5b4cecac6b8f25a 100644 (file)
--- a/ucm/bytcr-rt5651/bytcr-rt5651.conf
+++ b/ucm2/bytcr-rt5651/bytcr-rt5651.conf
@@ -1,10 +1,8 @@
 # Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
 
+Syntax 2
+
 SectionUseCase."HiFi" {
        File "HiFi.conf"
        Comment "Play HiFi quality Music"
 }
-
-SectionDefaults [
-       cdev "hw:bytcrrt5651"
-]

diff --git a/ucm/codecs/rt5651/DigitalMic.conf b/ucm2/codecs/rt5651/DigitalMic.conf
similarity index 91%
rename from ucm/codecs/rt5651/DigitalMic.conf
rename to ucm2/codecs/rt5651/DigitalMic.conf
index 63ffa9d5d8d6a201fdb8b37aa4c98573f5586833..7a0c4d4e59e9c599b0b479de92bb927903b52614 100644 (file)
--- a/ucm/codecs/rt5651/DigitalMic.conf
+++ b/ucm2/codecs/rt5651/DigitalMic.conf
@@ -10,14 +10,12 @@ SectionDevice."DigitalMic" {
        ]
 
        EnableSequence [
-               cdev "hw:bytcrrt5651"
                cset "name='Stereo1 ADC MIXL ADC2 Switch' on"
                cset "name='Stereo1 ADC MIXR ADC2 Switch' on"
                cset "name='Internal Mic Switch' on"
        ]
 
        DisableSequence [
-               cdev "hw:bytcrrt5651"
                cset "name='Stereo1 ADC MIXL ADC2 Switch' off"
                cset "name='Stereo1 ADC MIXR ADC2 Switch' off"
                cset "name='Internal Mic Switch' off"

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

diff --git a/ucm/codecs/rt5651/HeadPhones-swapped.conf b/ucm2/codecs/rt5651/HeadPhones-swapped.conf
similarity index 95%
rename from ucm/codecs/rt5651/HeadPhones-swapped.conf
rename to ucm2/codecs/rt5651/HeadPhones-swapped.conf
index e79b40a7a837907ce8374a896003aae8ca25b790..f5260a3734fb4bd66f2fe0d41724981f4ffb8c03 100644 (file)
--- a/ucm/codecs/rt5651/HeadPhones-swapped.conf
+++ b/ucm2/codecs/rt5651/HeadPhones-swapped.conf
@@ -7,8 +7,6 @@ SectionDevice."Headphones" {
        ]
 
        EnableSequence [
-               cdev "hw:bytcrrt5651"
-
                # Swap left and right
                cset "name='Stereo DAC MIXL DAC R1 Switch' on"
                cset "name='Stereo DAC MIXL DAC L1 Switch' off"
@@ -25,7 +23,6 @@ SectionDevice."Headphones" {
        ]
 
        DisableSequence [
-               cdev "hw:bytcrrt5651"
                # Disabling the HP switches is done by the Speaker EnableSeq
 
                # Unswap left and right

diff --git a/ucm/codecs/rt5651/HeadPhones.conf b/ucm2/codecs/rt5651/HeadPhones.conf
similarity index 93%
rename from ucm/codecs/rt5651/HeadPhones.conf
rename to ucm2/codecs/rt5651/HeadPhones.conf
index eaf5fdfc4e7c8e05d4f373d1a40bb0c944fd0572..0a87b32f5be5ec4a173d1dc0e26e95930db5ef05 100644 (file)
--- a/ucm/codecs/rt5651/HeadPhones.conf
+++ b/ucm2/codecs/rt5651/HeadPhones.conf
@@ -7,7 +7,6 @@ SectionDevice."Headphones" {
        ]
 
        EnableSequence [
-               cdev "hw:bytcrrt5651"
                cset "name='Headphone Switch' on"
                cset "name='HPO L Playback Switch' on"
                cset "name='HPO R Playback Switch' on"
@@ -18,7 +17,6 @@ SectionDevice."Headphones" {
        ]
 
        DisableSequence [
-               cdev "hw:bytcrrt5651"
                # This is done by the Speaker EnableSequence, so that the
                # Platform Clock and BIAS do not temporarily get turned off
                # as that breaks audio-streams which are playing when

diff --git a/ucm/codecs/rt5651/IN1-InternalMic.conf b/ucm2/codecs/rt5651/IN1-InternalMic.conf
similarity index 93%
rename from ucm/codecs/rt5651/IN1-InternalMic.conf
rename to ucm2/codecs/rt5651/IN1-InternalMic.conf
index 12ab5cbc5e8cb9a5368a64563fb4ec10123d35b1..01b786e17f5d7908e417443293b8dd8044bba6cf 100644 (file)
--- a/ucm/codecs/rt5651/IN1-InternalMic.conf
+++ b/ucm2/codecs/rt5651/IN1-InternalMic.conf
@@ -10,7 +10,6 @@ SectionDevice."InternalMic-IN1" {
        ]
 
        EnableSequence [
-               cdev "hw:bytcrrt5651"
                cset "name='Internal Mic Switch' on"
                cset "name='RECMIXL BST1 Switch' on"
                cset "name='RECMIXR BST1 Switch' on"
@@ -19,7 +18,6 @@ SectionDevice."InternalMic-IN1" {
        ]
 
        DisableSequence [
-               cdev "hw:bytcrrt5651"
                cset "name='Stereo1 ADC MIXL ADC1 Switch' off"
                cset "name='Stereo1 ADC MIXR ADC1 Switch' off"
                cset "name='Internal Mic Switch' off"

diff --git a/ucm/codecs/rt5651/IN12-InternalMic.conf b/ucm2/codecs/rt5651/IN12-InternalMic.conf
similarity index 94%
rename from ucm/codecs/rt5651/IN12-InternalMic.conf
rename to ucm2/codecs/rt5651/IN12-InternalMic.conf
index c4290b7530555de3e61d23ac64f685ebd6c669a4..44cc53ab4c73991824a71ecc9db347379a0e9932 100644 (file)
--- a/ucm/codecs/rt5651/IN12-InternalMic.conf
+++ b/ucm2/codecs/rt5651/IN12-InternalMic.conf
@@ -10,7 +10,6 @@ SectionDevice."InternalMic-IN12" {
        ]
 
        EnableSequence [
-               cdev "hw:bytcrrt5651"
                cset "name='Internal Mic Switch' on"
                cset "name='RECMIXL BST1 Switch' on"
                cset "name='RECMIXR BST1 Switch' on"
@@ -21,7 +20,6 @@ SectionDevice."InternalMic-IN12" {
        ]
 
        DisableSequence [
-               cdev "hw:bytcrrt5651"
                cset "name='Stereo1 ADC MIXL ADC1 Switch' off"
                cset "name='Stereo1 ADC MIXR ADC1 Switch' off"
                cset "name='Internal Mic Switch' off"

diff --git a/ucm/codecs/rt5651/IN2-HeadsetMic.conf b/ucm2/codecs/rt5651/IN2-HeadsetMic.conf
similarity index 93%
rename from ucm/codecs/rt5651/IN2-HeadsetMic.conf
rename to ucm2/codecs/rt5651/IN2-HeadsetMic.conf
index 8759c2748646557ba5ac3456ffcb214de2abfc5d..177f70b0c26996f998b24781d7400574f19324e1 100644 (file)
--- a/ucm/codecs/rt5651/IN2-HeadsetMic.conf
+++ b/ucm2/codecs/rt5651/IN2-HeadsetMic.conf
@@ -10,7 +10,6 @@ SectionDevice."HeadsetMic-IN2" {
        ]
 
        EnableSequence [
-               cdev "hw:bytcrrt5651"
                cset "name='Headset Mic Switch' on"
                cset "name='RECMIXL BST2 Switch' on"
                cset "name='RECMIXR BST2 Switch' on"
@@ -19,7 +18,6 @@ SectionDevice."HeadsetMic-IN2" {
        ]
 
        DisableSequence [
-               cdev "hw:bytcrrt5651"
                cset "name='Stereo1 ADC MIXL ADC1 Switch' off"
                cset "name='Stereo1 ADC MIXR ADC1 Switch' off"
                cset "name='Headset Mic Switch' off"

diff --git a/ucm/codecs/rt5651/IN2-InternalMic.conf b/ucm2/codecs/rt5651/IN2-InternalMic.conf
similarity index 93%
rename from ucm/codecs/rt5651/IN2-InternalMic.conf
rename to ucm2/codecs/rt5651/IN2-InternalMic.conf
index c9c11c28abee2acf7aad106f85d61b9b9ad47f76..611ca6c7553c40b3bf079fc09d945f4a049706f7 100644 (file)
--- a/ucm/codecs/rt5651/IN2-InternalMic.conf
+++ b/ucm2/codecs/rt5651/IN2-InternalMic.conf
@@ -10,7 +10,6 @@ SectionDevice."InternalMic-IN2" {
        ]
 
        EnableSequence [
-               cdev "hw:bytcrrt5651"
                cset "name='Internal Mic Switch' on"
                cset "name='RECMIXL BST2 Switch' on"
                cset "name='RECMIXR BST2 Switch' on"
@@ -19,7 +18,6 @@ SectionDevice."InternalMic-IN2" {
        ]
 
        DisableSequence [
-               cdev "hw:bytcrrt5651"
                cset "name='Stereo1 ADC MIXL ADC1 Switch' off"
                cset "name='Stereo1 ADC MIXR ADC1 Switch' off"
                cset "name='Internal Mic Switch' off"

diff --git a/ucm/codecs/rt5651/IN3-HeadsetMic.conf b/ucm2/codecs/rt5651/IN3-HeadsetMic.conf
similarity index 93%
rename from ucm/codecs/rt5651/IN3-HeadsetMic.conf
rename to ucm2/codecs/rt5651/IN3-HeadsetMic.conf
index 66af6b9be5913bbde0cd64ab9d739fca35346628..3231e78e4e2d58f4f93c860a0e2f113d00ef7fd9 100644 (file)
--- a/ucm/codecs/rt5651/IN3-HeadsetMic.conf
+++ b/ucm2/codecs/rt5651/IN3-HeadsetMic.conf
@@ -10,7 +10,6 @@ SectionDevice."HeadsetMic-IN3" {
        ]
 
        EnableSequence [
-               cdev "hw:bytcrrt5651"
                cset "name='Headset Mic Switch' on"
                cset "name='RECMIXL BST3 Switch' on"
                cset "name='RECMIXR BST3 Switch' on"
@@ -19,7 +18,6 @@ SectionDevice."HeadsetMic-IN3" {
        ]
 
        DisableSequence [
-               cdev "hw:bytcrrt5651"
                cset "name='Stereo1 ADC MIXL ADC1 Switch' off"
                cset "name='Stereo1 ADC MIXR ADC1 Switch' off"
                cset "name='Headset Mic Switch' off"

diff --git a/ucm/codecs/rt5651/MonoSpeaker.conf b/ucm2/codecs/rt5651/MonoSpeaker.conf
similarity index 96%
rename from ucm/codecs/rt5651/MonoSpeaker.conf
rename to ucm2/codecs/rt5651/MonoSpeaker.conf
index f4181d106b1474096d3924804c079c7f1575d32d..c2276c6fbbeea7e6db729cfe46f4f8b6db0d1204 100644 (file)
--- a/ucm/codecs/rt5651/MonoSpeaker.conf
+++ b/ucm2/codecs/rt5651/MonoSpeaker.conf
@@ -7,8 +7,6 @@ SectionDevice."MonoSpeaker" {
        ]
 
        EnableSequence [
-               cdev "hw:bytcrrt5651"
-
                # On most (all?) devices with a single / mono speaker an
                # amplifier with a differential input connected between LOUT
                # right and left is used. We deal with this by silencing the
@@ -36,7 +34,6 @@ SectionDevice."MonoSpeaker" {
        ]
 
        DisableSequence [
-               cdev "hw:bytcrrt5651"
                # Disabling the  switches is done by the Speaker EnableSeq
 
                # Undo mono mapping

diff --git a/ucm/codecs/rt5651/Speaker.conf b/ucm2/codecs/rt5651/Speaker.conf
similarity index 93%
rename from ucm/codecs/rt5651/Speaker.conf
rename to ucm2/codecs/rt5651/Speaker.conf
index c1091523700c95cd604f970067c2c46deb152c90..463d13b5525c988d54a9d30e88b4f2fce07404dd 100644 (file)
--- a/ucm/codecs/rt5651/Speaker.conf
+++ b/ucm2/codecs/rt5651/Speaker.conf
@@ -7,7 +7,6 @@ SectionDevice."Speaker" {
        ]
 
        EnableSequence [
-               cdev "hw:bytcrrt5651"
                cset "name='Speaker Switch' on"
                cset "name='LOUT L Playback Switch' on"
                cset "name='LOUT R Playback Switch' on"
@@ -18,7 +17,6 @@ SectionDevice."Speaker" {
        ]
 
        DisableSequence [
-               cdev "hw:bytcrrt5651"
                # This is done by the Headphones EnableSequence, so that the
                # Platform Clock and BIAS do not temporarily get turned off
                # as that breaks audio-streams which are playing when