GoogleNyan: adapt to ucm2

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

diff --git a/ucm/GoogleNyan/GoogleNyan.conf b/ucm2/GoogleNyan/GoogleNyan.conf
similarity index 91%
rename from ucm/GoogleNyan/GoogleNyan.conf
rename to ucm2/GoogleNyan/GoogleNyan.conf
index efe6ad8a5c6e89e670bfbbb25cdd809d7b121849..33f22cc80aec43c2992b4bd0faac0334c23dcdb1 100644 (file)
--- a/ucm/GoogleNyan/GoogleNyan.conf
+++ b/ucm2/GoogleNyan/GoogleNyan.conf
@@ -1,3 +1,4 @@
+Syntax 2
 Comment "Nyan internal card"
 SectionUseCase."HiFi" {
        File "HiFi.conf"

diff --git a/ucm/GoogleNyan/HiFi.conf b/ucm2/GoogleNyan/HiFi.conf
similarity index 91%
rename from ucm/GoogleNyan/HiFi.conf
rename to ucm2/GoogleNyan/HiFi.conf
index b28fe917162dc31656a18e5758622178faf7659d..00505903f389cfad385042975bd1fa1dc9fed912 100644 (file)
--- a/ucm/GoogleNyan/HiFi.conf
+++ b/ucm2/GoogleNyan/HiFi.conf
@@ -1,6 +1,5 @@
 SectionVerb {
        EnableSequence [
-               cdev "hw:GoogleNyan"
                cset "name='Left Speaker Mixer Left DAC Switch' on"
                cset "name='Right Speaker Mixer Right DAC Switch' on"
                cset "name='Headphone Left Switch' on"
@@ -36,39 +35,33 @@ SectionVerb {
                cset "name='Speaker Right Switch' on"
                cset "name='Speakers Switch' on"
        ]
-       DisableSequence [
-       ]
 }
 
-SectionDevice."Headphone".0 {
+SectionDevice."Headphone" {
        Value {
                OutputDspName ""
        }
        EnableSequence [
-               cdev "hw:GoogleNyan"
                cset "name='Speakers Switch' off"
                cset "name='Headphones Switch' on"
        ]
        DisableSequence [
-               cdev "hw:GoogleNyan"
                cset "name='Headphones Switch' off"
                cset "name='Speakers Switch' on"
        ]
 }
 
-SectionDevice."Mic".0 {
+SectionDevice."Mic" {
        Value {
                CaptureControl "MIC2"
        }
        EnableSequence [
-               cdev "hw:GoogleNyan"
                cset "name='Int Mic Switch' off"
                cset "name='DMIC Mux' ADC"
                cset "name='Mic Jack Switch' on"
                cset "name='Record Path DC Blocking' on"
        ]
        DisableSequence [
-               cdev "hw:GoogleNyan"
                cset "name='Mic Jack Switch' off"
                cset "name='DMIC Mux' DMIC"
                cset "name='Int Mic Switch' on"