chtnau8824: adapt to ucm2

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

diff --git a/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf b/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf
deleted file mode 100644 (file)
index b931b79..0000000
--- a/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-
-SectionVerb {
-
-       Value {
-               TQ "HiFi"
-               # ALSA PCM device for HiFi
-               PlaybackPCM "hw:chtnau8824"
-               CapturePCM "hw:chtnau8824"
-       }
-
-       EnableSequence [
-               cdev "hw:chtnau8824"
-               <platforms/bytcr/PlatformEnableSeq.conf>
-               <codecs/nau8824/EnableSeq.conf>
-       ]
-
-       DisableSequence [
-               cdev "hw:chtnau8824"
-               <platforms/bytcr/PlatformDisableSeq.conf>
-       ]
-}
-
-<codecs/nau8824/MonoSpeaker.conf>
-<codecs/nau8824/HeadPhones.conf>
-
-<codecs/nau8824/InternalMic.conf>
-<codecs/nau8824/HeadsetMic.conf>

diff --git a/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/cube-i1_TF-Defaultstring-CherryTrailCR.conf b/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/cube-i1_TF-Defaultstring-CherryTrailCR.conf
deleted file mode 100644 (file)
index 3775ed4..0000000
--- a/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/cube-i1_TF-Defaultstring-CherryTrailCR.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Comment "chtnau8824 internal card"
-
-SectionUseCase."HiFi" {
-       File "../cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf"
-       Comment "Default"
-}

diff --git a/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf b/ucm2/chtnau8824/HiFi-mono.conf
similarity index 78%
rename from ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf
rename to ucm2/chtnau8824/HiFi-mono.conf
index b931b7914ce7af6256c24bb5d7d2cd264b0180f7..3433d03b416cae81675796bb192f096574f88f4d 100644 (file)
--- a/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf
+++ b/ucm2/chtnau8824/HiFi-mono.conf
@@ -4,18 +4,16 @@ SectionVerb {
        Value {
                TQ "HiFi"
                # ALSA PCM device for HiFi
-               PlaybackPCM "hw:chtnau8824"
-               CapturePCM "hw:chtnau8824"
+               PlaybackPCM "hw:${CardId}"
+               CapturePCM "hw:${CardId}"
        }
 
        EnableSequence [
-               cdev "hw:chtnau8824"
                <platforms/bytcr/PlatformEnableSeq.conf>
                <codecs/nau8824/EnableSeq.conf>
        ]
 
        DisableSequence [
-               cdev "hw:chtnau8824"
                <platforms/bytcr/PlatformDisableSeq.conf>
        ]
 }

diff --git a/ucm/chtnau8824/HiFi.conf b/ucm2/chtnau8824/HiFi.conf
similarity index 77%
rename from ucm/chtnau8824/HiFi.conf
rename to ucm2/chtnau8824/HiFi.conf
index 845cbcaffe5fd5d5ebe274c3423b7f3e41953db9..9f7ac74bba40b4c92941e1337699bfadea0683b1 100644 (file)
--- a/ucm/chtnau8824/HiFi.conf
+++ b/ucm2/chtnau8824/HiFi.conf
@@ -4,18 +4,16 @@ SectionVerb {
        Value {
                TQ "HiFi"
                # ALSA PCM device for HiFi
-               PlaybackPCM "hw:chtnau8824"
-               CapturePCM "hw:chtnau8824"
+               PlaybackPCM "hw:${CardId}"
+               CapturePCM "hw:${CardId}"
        }
 
        EnableSequence [
-               cdev "hw:chtnau8824"
                <platforms/bytcr/PlatformEnableSeq.conf>
                <codecs/nau8824/EnableSeq.conf>
        ]
 
        DisableSequence [
-               cdev "hw:chtnau8824"
                <platforms/bytcr/PlatformDisableSeq.conf>
        ]
 }

diff --git a/ucm2/chtnau8824/PIPO-W2S-Defaultstring-CherryTrailCR.conf b/ucm2/chtnau8824/PIPO-W2S-Defaultstring-CherryTrailCR.conf
new file mode 120000 (symlink)
index 0000000..e3af8b6
--- /dev/null
+++ b/ucm2/chtnau8824/PIPO-W2S-Defaultstring-CherryTrailCR.conf
@@ -0,0 +1 @@
+chtnau8824-mono.conf
\ No newline at end of file

diff --git a/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/PIPO-W2S-Defaultstring-CherryTrailCR.conf b/ucm2/chtnau8824/chtnau8824-mono.conf
similarity index 58%
rename from ucm/PIPO-W2S-Defaultstring-CherryTrailCR/PIPO-W2S-Defaultstring-CherryTrailCR.conf
rename to ucm2/chtnau8824/chtnau8824-mono.conf
index 37a8d04e88e73c49cd77bcc09884f894ca76b074..75f48709da337646c7717199cb5ae203b18df0ff 100644 (file)
--- a/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/PIPO-W2S-Defaultstring-CherryTrailCR.conf
+++ b/ucm2/chtnau8824/chtnau8824-mono.conf
@@ -1,6 +1,8 @@
+Syntax 2
+
 Comment "chtnau8824 internal card"
 
 SectionUseCase."HiFi" {
-       File "../PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf"
+       File "HiFi-mono.conf"
        Comment "Default"
 }

diff --git a/ucm/chtnau8824/chtnau8824.conf b/ucm2/chtnau8824/chtnau8824.conf
similarity index 90%
rename from ucm/chtnau8824/chtnau8824.conf
rename to ucm2/chtnau8824/chtnau8824.conf
index 189b0dbe2e26e5b609bc5c808f773968b666177d..acd5deb300784c9b01a324b2c516d4632ac9e8f3 100644 (file)
--- a/ucm/chtnau8824/chtnau8824.conf
+++ b/ucm2/chtnau8824/chtnau8824.conf
@@ -1,3 +1,5 @@
+Syntax 2
+
 Comment "chtnau8824 internal card"
 
 SectionUseCase."HiFi" {

diff --git a/ucm2/chtnau8824/cube-i1_TF-Defaultstring-CherryTrailCR.conf b/ucm2/chtnau8824/cube-i1_TF-Defaultstring-CherryTrailCR.conf
new file mode 120000 (symlink)
index 0000000..e3af8b6
--- /dev/null
+++ b/ucm2/chtnau8824/cube-i1_TF-Defaultstring-CherryTrailCR.conf
@@ -0,0 +1 @@
+chtnau8824-mono.conf
\ No newline at end of file

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

diff --git a/ucm/codecs/nau8824/HeadPhones.conf b/ucm2/codecs/nau8824/HeadPhones.conf
similarity index 85%
rename from ucm/codecs/nau8824/HeadPhones.conf
rename to ucm2/codecs/nau8824/HeadPhones.conf
index 8ed6f194aeeaa156b2ca98ac0d8f2c267cd3989c..f35f4e20f21eaeae04b0c57f4b0e25f0887e0d20 100644 (file)
--- a/ucm/codecs/nau8824/HeadPhones.conf
+++ b/ucm2/codecs/nau8824/HeadPhones.conf
@@ -12,14 +12,10 @@ SectionDevice."Headphones" {
        ]
 
        EnableSequence [
-               cdev "hw:chtnau8824"
-
                cset "name='Headphone Switch' on"
        ]
 
        DisableSequence [
-               cdev "hw:chtnau8824"
-
                cset "name='Headphone Switch' off"
        ]
 }

diff --git a/ucm/codecs/nau8824/HeadsetMic.conf b/ucm2/codecs/nau8824/HeadsetMic.conf
similarity index 91%
rename from ucm/codecs/nau8824/HeadsetMic.conf
rename to ucm2/codecs/nau8824/HeadsetMic.conf
index 11b0b52a3f16e011e297dc5b451f375a0c401d73..bc17f9fde42105603925989dc317c3fcca2d2ed2 100644 (file)
--- a/ucm/codecs/nau8824/HeadsetMic.conf
+++ b/ucm2/codecs/nau8824/HeadsetMic.conf
@@ -11,8 +11,6 @@ SectionDevice."HeadsetMic" {
        ]
 
        EnableSequence [
-               cdev "hw:chtnau8824"
-
                cset "name='ADC CH0 Select' 1"
                cset "name='ADC CH1 Select' 1"
 
@@ -22,8 +20,6 @@ SectionDevice."HeadsetMic" {
        ]
 
        DisableSequence [
-               cdev "hw:chtnau8824"
-
                cset "name='Headset Mic Switch' off"
                cset "name='Right ADC HSMIC Switch' off"
                cset "name='Left ADC HSMIC Switch' off"

diff --git a/ucm/codecs/nau8824/InternalMic.conf b/ucm2/codecs/nau8824/InternalMic.conf
similarity index 91%
rename from ucm/codecs/nau8824/InternalMic.conf
rename to ucm2/codecs/nau8824/InternalMic.conf
index c6a741cc6a92d5a1c7af0a280a1e7dcaa635ff63..3793d6435253dd99de1c28212720933ca6e96a82 100644 (file)
--- a/ucm/codecs/nau8824/InternalMic.conf
+++ b/ucm2/codecs/nau8824/InternalMic.conf
@@ -11,8 +11,6 @@ SectionDevice."InternalMic" {
        ]
 
        EnableSequence [
-               cdev "hw:chtnau8824"
-
                cset "name='ADC CH0 Select' 0"
                cset "name='ADC CH1 Select' 0"
 
@@ -22,8 +20,6 @@ SectionDevice."InternalMic" {
        ]
 
        DisableSequence [
-               cdev "hw:chtnau8824"
-
                cset "name='Int Mic Switch' off"
                cset "name='Right ADC MIC Switch' off"
                cset "name='Left ADC MIC Switch' off"

diff --git a/ucm/codecs/nau8824/MonoSpeaker.conf b/ucm2/codecs/nau8824/MonoSpeaker.conf
similarity index 91%
rename from ucm/codecs/nau8824/MonoSpeaker.conf
rename to ucm2/codecs/nau8824/MonoSpeaker.conf
index 8673518126aa72a9369c323a13da83ca2df680b4..5321c8af1eaad357db6ed0fbe97d169ebccafbd0 100644 (file)
--- a/ucm/codecs/nau8824/MonoSpeaker.conf
+++ b/ucm2/codecs/nau8824/MonoSpeaker.conf
@@ -11,8 +11,6 @@ SectionDevice."MonoSpeaker" {
        ]
 
        EnableSequence [
-               cdev "hw:chtnau8824"
-
                # nau8824 mono speaker boards have the speaker on the right chan
                cset "name='Speaker Left DACL Volume' 0"
                cset "name='Speaker Left DACR Volume' 0"
@@ -22,8 +20,6 @@ SectionDevice."MonoSpeaker" {
        ]
 
        DisableSequence [
-               cdev "hw:chtnau8824"
-
                cset "name='Ext Spk Switch' off"
        ]
 }

diff --git a/ucm/codecs/nau8824/Speaker.conf b/ucm2/codecs/nau8824/Speaker.conf
similarity index 89%
rename from ucm/codecs/nau8824/Speaker.conf
rename to ucm2/codecs/nau8824/Speaker.conf
index e4d25b087987c572a77def9867c17b804f6b033e..474c37392b51ca69e8f8db414afea4b154b583d8 100644 (file)
--- a/ucm/codecs/nau8824/Speaker.conf
+++ b/ucm2/codecs/nau8824/Speaker.conf
@@ -11,8 +11,6 @@ SectionDevice."Speaker" {
        ]
 
        EnableSequence [
-               cdev "hw:chtnau8824"
-
                cset "name='Speaker Left DACL Volume' 1"
                cset "name='Speaker Left DACR Volume' 0"
                cset "name='Speaker Right DACL Volume' 0"
@@ -21,8 +19,6 @@ SectionDevice."Speaker" {
        ]
 
        DisableSequence [
-               cdev "hw:chtnau8824"
-
                cset "name='Ext Spk Switch' off"
        ]
 }