chtrt5645: adapt to ucm2

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

diff --git a/ucm/TECLAST-X80Pro-Defaultstring-CherryTrailCR/TECLAST-X80Pro-Defaultstring-CherryTrailCR.conf b/ucm/TECLAST-X80Pro-Defaultstring-CherryTrailCR/TECLAST-X80Pro-Defaultstring-CherryTrailCR.conf
deleted file mode 120000 (symlink)
index 1b1d475..0000000
--- a/ucm/TECLAST-X80Pro-Defaultstring-CherryTrailCR/TECLAST-X80Pro-Defaultstring-CherryTrailCR.conf
+++ /dev/null
@@ -1 +0,0 @@
-../chtrt5645-mono-speaker-analog-mic/chtrt5645-mono-speaker-analog-mic.conf
\ No newline at end of file

diff --git a/ucm/gpd-win-pocket-rt5645/gpd-win-pocket-rt5645.conf b/ucm/gpd-win-pocket-rt5645/gpd-win-pocket-rt5645.conf
deleted file mode 120000 (symlink)
index 1b1d475..0000000
--- a/ucm/gpd-win-pocket-rt5645/gpd-win-pocket-rt5645.conf
+++ /dev/null
@@ -1 +0,0 @@
-../chtrt5645-mono-speaker-analog-mic/chtrt5645-mono-speaker-analog-mic.conf
\ No newline at end of file

diff --git a/ucm2/chtrt5645/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN.conf b/ucm2/chtrt5645/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN.conf
new file mode 120000 (symlink)
index 0000000..b4d2816
--- /dev/null
+++ b/ucm2/chtrt5645/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN.conf
@@ -0,0 +1 @@
+chtrt5645-dmic1.conf
\ No newline at end of file

diff --git a/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf b/ucm2/chtrt5645/HiFi-dmic1.conf
similarity index 88%
rename from ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf
rename to ucm2/chtrt5645/HiFi-dmic1.conf
index 87e0e4ec99a57b0910f094478d0bd4bc4b0e22e2..90d18c0ade26485072445e9d790eebf802648630 100644 (file)
--- a/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf
+++ b/ucm2/chtrt5645/HiFi-dmic1.conf
@@ -4,13 +4,11 @@ SectionVerb {
                TQ "HiFi"
 
                # ALSA PCM device for HiFi
-               PlaybackPCM "hw:chtrt5645"
-               CapturePCM "hw:chtrt5645"
+               PlaybackPCM "hw:${CardId}"
+               CapturePCM "hw:${CardId}"
        }
 
        EnableSequence [
-               cdev "hw:chtrt5645"
-
                <platforms/bytcr/PlatformEnableSeq.conf>
                <codecs/rt5645/EnableSeq.conf>
 
@@ -23,8 +21,6 @@ SectionVerb {
        ]
 
        DisableSequence [
-               cdev "hw:chtrt5645"
-
                <codecs/rt5645/DisableSeq.conf>
        ]
 }
@@ -41,14 +37,10 @@ SectionDevice."Speaker" {
        ]
 
        EnableSequence [
-               cdev "hw:chtrt5645"
-
                <codecs/rt5645/SpeakerEnableSeq.conf>
        ]
 
        DisableSequence [
-               cdev "hw:chtrt5645"
-
                cset "name='Ext Spk Switch' off"
                cset "name='Speaker Channel Switch' off"
        ]
@@ -68,14 +60,10 @@ SectionDevice."Headphones" {
        ]
 
        EnableSequence [
-               cdev "hw:chtrt5645"
-
                <codecs/rt5645/HeadphonesEnableSeq.conf>
        ]
 
        DisableSequence [
-               cdev "hw:chtrt5645"
-
                cset "name='Headphone Switch' off"
                cset "name='Headphone Channel Switch' off"
        ]
@@ -90,8 +78,6 @@ SectionDevice."DMic".0 {
        }
 
        EnableSequence [
-               cdev "hw:chtrt5645"
-
                <codecs/rt5645/DigitalMicEnableSeq.conf>
 
                cset "name='Stereo1 DMIC Mux' DMIC1"
@@ -101,8 +87,6 @@ SectionDevice."DMic".0 {
        ]
 
        DisableSequence [
-               cdev "hw:chtrt5645"
-
                <codecs/rt5645/DigitalMicDisableSeq.conf>
        ]
 }
@@ -117,8 +101,6 @@ SectionDevice."HSMic".0 {
        }
 
        EnableSequence [
-               cdev "hw:chtrt5645"
-
                <codecs/rt5645/HSMicEnableSeq.conf>
 
                cset "name='Sto1 ADC MIXL ADC2 Switch' off"
@@ -131,8 +113,6 @@ SectionDevice."HSMic".0 {
        ]
 
        DisableSequence [
-               cdev "hw:chtrt5645"
-
                <codecs/rt5645/HSMicEnableSeq.conf>
 
                cset "name='Mono ADC MIXL ADC1 Switch' on"

diff --git a/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf b/ucm2/chtrt5645/HiFi-dmic2.conf
similarity index 88%
rename from ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf
rename to ucm2/chtrt5645/HiFi-dmic2.conf
index 8930fe892a79b76d8f57bc75707f0e633ab6061c..58c36343b338dfe0612d7bcc882880a055c4bda0 100644 (file)
--- a/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf
+++ b/ucm2/chtrt5645/HiFi-dmic2.conf
@@ -4,13 +4,11 @@ SectionVerb {
                TQ "HiFi"
 
                # ALSA PCM device for HiFi
-               PlaybackPCM "hw:chtrt5645"
-               CapturePCM "hw:chtrt5645"
+               PlaybackPCM "hw:${CardId}"
+               CapturePCM "hw:${CardId}"
        }
 
        EnableSequence [
-               cdev "hw:chtrt5645"
-
                <platforms/bytcr/PlatformEnableSeq.conf>
                <codecs/rt5645/EnableSeq.conf>
 
@@ -23,8 +21,6 @@ SectionVerb {
        ]
 
        DisableSequence [
-               cdev "hw:chtrt5645"
-
                <codecs/rt5645/DisableSeq.conf>
        ]
 }
@@ -41,14 +37,10 @@ SectionDevice."Speaker" {
        ]
 
        EnableSequence [
-               cdev "hw:chtrt5645"
-
                <codecs/rt5645/SpeakerEnableSeq.conf>
        ]
 
        DisableSequence [
-               cdev "hw:chtrt5645"
-
                cset "name='Ext Spk Switch' off"
                cset "name='Speaker Channel Switch' off"
        ]
@@ -68,14 +60,10 @@ SectionDevice."Headphones" {
        ]
 
        EnableSequence [
-               cdev "hw:chtrt5645"
-
                <codecs/rt5645/HeadphonesEnableSeq.conf>
        ]
 
        DisableSequence [
-               cdev "hw:chtrt5645"
-
                cset "name='Headphone Switch' off"
                cset "name='Headphone Channel Switch' off"
        ]
@@ -90,8 +78,6 @@ SectionDevice."DMic".0 {
        }
 
        EnableSequence [
-               cdev "hw:chtrt5645"
-
                <codecs/rt5645/DigitalMicEnableSeq.conf>
 
                cset "name='Stereo1 DMIC Mux' DMIC2"
@@ -103,8 +89,6 @@ SectionDevice."DMic".0 {
        ]
 
        DisableSequence [
-               cdev "hw:chtrt5645"
-
                <codecs/rt5645/DigitalMicDisableSeq.conf>
        ]
 }
@@ -119,8 +103,6 @@ SectionDevice."HSMic".0 {
        }
 
        EnableSequence [
-               cdev "hw:chtrt5645"
-
                <codecs/rt5645/HSMicEnableSeq.conf>
 
                cset "name='Sto1 ADC MIXL ADC2 Switch' off"
@@ -133,8 +115,6 @@ SectionDevice."HSMic".0 {
        ]
 
        DisableSequence [
-               cdev "hw:chtrt5645"
-
                <codecs/rt5645/HSMicEnableSeq.conf>
 
                cset "name='Mono ADC MIXL ADC1 Switch' on"

diff --git a/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf b/ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf
similarity index 89%
rename from ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf
rename to ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf
index 43cb4d63b2d32df0fd03980ab48d69f756c55b4b..be65174eba3827f90f59a4a624e74d8b6794b8d7 100644 (file)
--- a/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf
+++ b/ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf
@@ -4,13 +4,11 @@ SectionVerb {
                TQ "HiFi"
 
                # ALSA PCM device for HiFi
-               PlaybackPCM "hw:chtrt5645"
-               CapturePCM "hw:chtrt5645"
+               PlaybackPCM "hw:${CardId}"
+               CapturePCM "hw:${CardId}"
        }
 
        EnableSequence [
-               cdev "hw:chtrt5645"
-
                <platforms/bytcr/PlatformEnableSeq.conf>
                <codecs/rt5645/EnableSeq.conf>
 
@@ -23,8 +21,6 @@ SectionVerb {
        ]
 
        DisableSequence [
-               cdev "hw:chtrt5645"
-
                <codecs/rt5645/DisableSeq.conf>
        ]
 }
@@ -41,8 +37,6 @@ SectionDevice."Speaker" {
        ]
 
        EnableSequence [
-               cdev "hw:chtrt5645"
-
                # Monospeaker: Mix right to left
                cset "name='Stereo DAC MIXL DAC R1 Switch' 1"
                cset "name='Stereo DAC MIXR DAC R1 Switch' 0"
@@ -51,8 +45,6 @@ SectionDevice."Speaker" {
        ]
 
        DisableSequence [
-               cdev "hw:chtrt5645"
-
                cset "name='Ext Spk Switch' off"
                cset "name='Speaker Channel Switch' off"
        ]
@@ -72,8 +64,6 @@ SectionDevice."Headphones" {
        ]
 
        EnableSequence [
-               cdev "hw:chtrt5645"
-
                # Undo monospeaker mixing
                cset "name='Stereo DAC MIXL DAC R1 Switch' 0"
                cset "name='Stereo DAC MIXR DAC R1 Switch' 1"
@@ -82,8 +72,6 @@ SectionDevice."Headphones" {
        ]
 
        DisableSequence [
-               cdev "hw:chtrt5645"
-
                cset "name='Headphone Switch' off"
                cset "name='Headphone Channel Switch' off"
        ]
@@ -101,8 +89,6 @@ SectionDevice."HSMic".0 {
        }
 
        EnableSequence [
-               cdev "hw:chtrt5645"
-
                <codecs/rt5645/HSMicEnableSeq.conf>
 
                cset "name='Sto1 ADC MIXL ADC2 Switch' off"
@@ -115,8 +101,6 @@ SectionDevice."HSMic".0 {
        ]
 
        DisableSequence [
-               cdev "hw:chtrt5645"
-
                <codecs/rt5645/HSMicDisableSeq.conf>
 
                cset "name='Mono ADC MIXL ADC1 Switch' on"

diff --git a/ucm/chtrt5645/HiFi.conf b/ucm2/chtrt5645/HiFi.conf
similarity index 88%
rename from ucm/chtrt5645/HiFi.conf
rename to ucm2/chtrt5645/HiFi.conf
index 53300f6227815da52681203262d090d8fd4152fa..a6d79f62f039e9a9fa172b08c00951118721a869 100644 (file)
--- a/ucm/chtrt5645/HiFi.conf
+++ b/ucm2/chtrt5645/HiFi.conf
@@ -4,13 +4,11 @@ SectionVerb {
                TQ "HiFi"
 
                # ALSA PCM device for HiFi
-               PlaybackPCM "hw:chtrt5645"
-               CapturePCM "hw:chtrt5645"
+               PlaybackPCM "hw:${CardId}"
+               CapturePCM "hw:${CardId}"
        }
 
        EnableSequence [
-               cdev "hw:chtrt5645"
-
                <platforms/bytcr/PlatformEnableSeq.conf>
                <codecs/rt5645/EnableSeq.conf>
 
@@ -23,8 +21,6 @@ SectionVerb {
        ]
 
        DisableSequence [
-               cdev "hw:chtrt5645"
-
                <codecs/rt5645/DisableSeq.conf>
        ]
 }
@@ -41,14 +37,10 @@ SectionDevice."Speaker" {
        ]
 
        EnableSequence [
-               cdev "hw:chtrt5645"
-
                <codecs/rt5645/SpeakerEnableSeq.conf>
        ]
 
        DisableSequence [
-               cdev "hw:chtrt5645"
-
                cset "name='Ext Spk Switch' off"
                cset "name='Speaker Channel Switch' off"
        ]
@@ -68,14 +60,10 @@ SectionDevice."Headphones" {
        ]
 
        EnableSequence [
-               cdev "hw:chtrt5645"
-
                <codecs/rt5645/HeadphonesEnableSeq.conf>
        ]
 
        DisableSequence [
-               cdev "hw:chtrt5645"
-
                cset "name='Headphone Switch' off"
                cset "name='Headphone Channel Switch' off"
        ]
@@ -93,8 +81,6 @@ SectionDevice."HSMic".0 {
        }
 
        EnableSequence [
-               cdev "hw:chtrt5645"
-
                <codecs/rt5645/HSMicEnableSeq.conf>
 
                cset "name='Sto1 ADC MIXL ADC2 Switch' off"
@@ -107,8 +93,6 @@ SectionDevice."HSMic".0 {
        ]
 
        DisableSequence [
-               cdev "hw:chtrt5645"
-
                <codecs/rt5645/HSMicDisableSeq.conf>
 
                cset "name='Mono ADC MIXL ADC1 Switch' on"

diff --git a/ucm2/chtrt5645/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216.conf b/ucm2/chtrt5645/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216.conf
new file mode 120000 (symlink)
index 0000000..7823e31
--- /dev/null
+++ b/ucm2/chtrt5645/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216.conf
@@ -0,0 +1 @@
+chtrt5645-dmic2.conf
\ No newline at end of file

diff --git a/ucm2/chtrt5645/TECLAST-X80Pro-Defaultstring-CherryTrailCR.conf b/ucm2/chtrt5645/TECLAST-X80Pro-Defaultstring-CherryTrailCR.conf
new file mode 120000 (symlink)
index 0000000..578d55a
--- /dev/null
+++ b/ucm2/chtrt5645/TECLAST-X80Pro-Defaultstring-CherryTrailCR.conf
@@ -0,0 +1 @@
+chtrt5645-mono-speaker-analog-mic.conf
\ No newline at end of file

diff --git a/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN.conf b/ucm2/chtrt5645/chtrt5645-dmic1.conf
similarity index 56%
rename from ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN.conf
rename to ucm2/chtrt5645/chtrt5645-dmic1.conf
index 5afe5f0b8670b9c987195cfc7dbefb80209814b3..fc6c32f2216bbbd8240757ef038f8ca1fbb9a2ff 100644 (file)
--- a/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN.conf
+++ b/ucm2/chtrt5645/chtrt5645-dmic1.conf
@@ -1,5 +1,6 @@
+Syntax 2
 Comment "Intel SoC Audio Device"
 SectionUseCase."HiFi" {
-       File "../ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf"
+       File "HiFi-dmic1.conf"
        Comment "Default"
 }

diff --git a/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216.conf b/ucm2/chtrt5645/chtrt5645-dmic2.conf
similarity index 94%
rename from ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216.conf
rename to ucm2/chtrt5645/chtrt5645-dmic2.conf
index 50bda000a8b114e0d10e96fbdb29d8f6337b69c4..9bbebfaa66cf37320c7bfc95cf97aec4c5780397 100644 (file)
--- a/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216.conf
+++ b/ucm2/chtrt5645/chtrt5645-dmic2.conf
@@ -1,3 +1,4 @@
+Syntax 2
 Comment "Intel SoC Audio Device"
 SectionUseCase."HiFi" {
        File "../LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf"

diff --git a/ucm/chtrt5645-mono-speaker-analog-mic/chtrt5645-mono-speaker-analog-mic.conf b/ucm2/chtrt5645/chtrt5645-mono-speaker-analog-mic.conf
similarity index 58%
rename from ucm/chtrt5645-mono-speaker-analog-mic/chtrt5645-mono-speaker-analog-mic.conf
rename to ucm2/chtrt5645/chtrt5645-mono-speaker-analog-mic.conf
index b1a5206e24b19be053efae3496a8131011e60fff..aacce6c637d939e7ffab5f0c7c4d94f176adc35e 100644 (file)
--- a/ucm/chtrt5645-mono-speaker-analog-mic/chtrt5645-mono-speaker-analog-mic.conf
+++ b/ucm2/chtrt5645/chtrt5645-mono-speaker-analog-mic.conf
@@ -1,5 +1,6 @@
+Syntax 2
 Comment "Intel SoC Audio Device"
 SectionUseCase."HiFi" {
-       File "../chtrt5645-mono-speaker-analog-mic/HiFi.conf"
+       File "HiFi-mono-speaker-analog-mic.conf"
        Comment "Default"
 }

diff --git a/ucm/chtrt5645/chtrt5645.conf b/ucm2/chtrt5645/chtrt5645.conf
similarity index 91%
rename from ucm/chtrt5645/chtrt5645.conf
rename to ucm2/chtrt5645/chtrt5645.conf
index dfc36c891be07482c76eee9a6f27660531bbdb5c..7de572a4a961651dcc62176ab067463d171b3660 100644 (file)
--- a/ucm/chtrt5645/chtrt5645.conf
+++ b/ucm2/chtrt5645/chtrt5645.conf
@@ -1,3 +1,4 @@
+Syntax 2
 Comment "Intel SoC Audio Device"
 SectionUseCase."HiFi" {
        File "HiFi.conf"

diff --git a/ucm2/chtrt5645/gpd-win-pocket-rt5645.conf b/ucm2/chtrt5645/gpd-win-pocket-rt5645.conf
new file mode 120000 (symlink)
index 0000000..578d55a
--- /dev/null
+++ b/ucm2/chtrt5645/gpd-win-pocket-rt5645.conf
@@ -0,0 +1 @@
+chtrt5645-mono-speaker-analog-mic.conf
\ No newline at end of file

diff --git a/ucm/codecs/rt5645/AnalogMic.conf b/ucm2/codecs/rt5645/AnalogMic.conf
similarity index 95%
rename from ucm/codecs/rt5645/AnalogMic.conf
rename to ucm2/codecs/rt5645/AnalogMic.conf
index cbcefa7a2c5e90cafe615b35fd6fe0c976369b04..1e97980d225c6e28d10ac857bf853c2a2df21e16 100644 (file)
--- a/ucm/codecs/rt5645/AnalogMic.conf
+++ b/ucm2/codecs/rt5645/AnalogMic.conf
@@ -7,8 +7,6 @@ SectionDevice."Mic".0 {
        }
 
        EnableSequence [
-               cdev "hw:chtrt5645"
-
                cset "name='Int Analog Mic Switch' on"
 
                cset "name='Sto1 ADC MIXL ADC1 Switch' on"
@@ -26,8 +24,6 @@ SectionDevice."Mic".0 {
        ]
 
        DisableSequence [
-               cdev "hw:chtrt5645"
-
                cset "name='Sto1 ADC MIXL ADC1 Switch' off"
                cset "name='Sto1 ADC MIXR ADC1 Switch' off"
                cset "name='Mono ADC MIXL ADC1 Switch' off"

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

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

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

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

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

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

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

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