From 3112e66a868fffae9a026aa2f4f71cfe7bd3ae8b Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 21 Nov 2019 14:14:08 +0100 Subject: [PATCH] chtrt5645: adapt to ucm2 Signed-off-by: Jaroslav Kysela --- ...ST-X80Pro-Defaultstring-CherryTrailCR.conf | 1 - .../gpd-win-pocket-rt5645.conf | 1 - ...USTeKCOMPUTERINC.-T100HAN-1.0-T100HAN.conf | 1 + .../chtrt5645/HiFi-dmic1.conf | 24 ++----------------- .../chtrt5645/HiFi-dmic2.conf | 24 ++----------------- .../HiFi-mono-speaker-analog-mic.conf | 20 ++-------------- {ucm => ucm2}/chtrt5645/HiFi.conf | 20 ++-------------- ...-80XF-LenovoMIIX320_10ICR-LNVNB161216.conf | 1 + ...ST-X80Pro-Defaultstring-CherryTrailCR.conf | 1 + .../chtrt5645/chtrt5645-dmic1.conf | 3 ++- .../chtrt5645/chtrt5645-dmic2.conf | 1 + .../chtrt5645-mono-speaker-analog-mic.conf | 3 ++- {ucm => ucm2}/chtrt5645/chtrt5645.conf | 1 + ucm2/chtrt5645/gpd-win-pocket-rt5645.conf | 1 + {ucm => ucm2}/codecs/rt5645/AnalogMic.conf | 4 ---- .../codecs/rt5645/DigitalMicDisableSeq.conf | 0 .../codecs/rt5645/DigitalMicEnableSeq.conf | 0 {ucm => ucm2}/codecs/rt5645/DisableSeq.conf | 0 {ucm => ucm2}/codecs/rt5645/EnableSeq.conf | 0 .../codecs/rt5645/HSMicDisableSeq.conf | 0 .../codecs/rt5645/HSMicEnableSeq.conf | 0 .../codecs/rt5645/HeadphonesEnableSeq.conf | 0 .../codecs/rt5645/SpeakerEnableSeq.conf | 0 23 files changed, 18 insertions(+), 88 deletions(-) delete mode 120000 ucm/TECLAST-X80Pro-Defaultstring-CherryTrailCR/TECLAST-X80Pro-Defaultstring-CherryTrailCR.conf delete mode 120000 ucm/gpd-win-pocket-rt5645/gpd-win-pocket-rt5645.conf create mode 120000 ucm2/chtrt5645/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN.conf rename ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf => ucm2/chtrt5645/HiFi-dmic1.conf (88%) rename ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf => ucm2/chtrt5645/HiFi-dmic2.conf (88%) rename ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf => ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf (89%) rename {ucm => ucm2}/chtrt5645/HiFi.conf (88%) create mode 120000 ucm2/chtrt5645/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216.conf create mode 120000 ucm2/chtrt5645/TECLAST-X80Pro-Defaultstring-CherryTrailCR.conf rename ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN.conf => ucm2/chtrt5645/chtrt5645-dmic1.conf (56%) rename ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216.conf => ucm2/chtrt5645/chtrt5645-dmic2.conf (94%) rename {ucm/chtrt5645-mono-speaker-analog-mic => ucm2/chtrt5645}/chtrt5645-mono-speaker-analog-mic.conf (58%) rename {ucm => ucm2}/chtrt5645/chtrt5645.conf (91%) create mode 120000 ucm2/chtrt5645/gpd-win-pocket-rt5645.conf rename {ucm => ucm2}/codecs/rt5645/AnalogMic.conf (95%) rename {ucm => ucm2}/codecs/rt5645/DigitalMicDisableSeq.conf (100%) rename {ucm => ucm2}/codecs/rt5645/DigitalMicEnableSeq.conf (100%) rename {ucm => ucm2}/codecs/rt5645/DisableSeq.conf (100%) rename {ucm => ucm2}/codecs/rt5645/EnableSeq.conf (100%) rename {ucm => ucm2}/codecs/rt5645/HSMicDisableSeq.conf (100%) rename {ucm => ucm2}/codecs/rt5645/HSMicEnableSeq.conf (100%) rename {ucm => ucm2}/codecs/rt5645/HeadphonesEnableSeq.conf (100%) rename {ucm => ucm2}/codecs/rt5645/SpeakerEnableSeq.conf (100%) 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 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 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 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 87e0e4e..90d18c0 100644 --- 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" - @@ -23,8 +21,6 @@ SectionVerb { ] DisableSequence [ - cdev "hw:chtrt5645" - ] } @@ -41,14 +37,10 @@ SectionDevice."Speaker" { ] EnableSequence [ - cdev "hw:chtrt5645" - ] 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" - ] 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" - cset "name='Stereo1 DMIC Mux' DMIC1" @@ -101,8 +87,6 @@ SectionDevice."DMic".0 { ] DisableSequence [ - cdev "hw:chtrt5645" - ] } @@ -117,8 +101,6 @@ SectionDevice."HSMic".0 { } EnableSequence [ - cdev "hw:chtrt5645" - cset "name='Sto1 ADC MIXL ADC2 Switch' off" @@ -131,8 +113,6 @@ SectionDevice."HSMic".0 { ] DisableSequence [ - cdev "hw:chtrt5645" - 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 8930fe8..58c3634 100644 --- 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" - @@ -23,8 +21,6 @@ SectionVerb { ] DisableSequence [ - cdev "hw:chtrt5645" - ] } @@ -41,14 +37,10 @@ SectionDevice."Speaker" { ] EnableSequence [ - cdev "hw:chtrt5645" - ] 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" - ] 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" - cset "name='Stereo1 DMIC Mux' DMIC2" @@ -103,8 +89,6 @@ SectionDevice."DMic".0 { ] DisableSequence [ - cdev "hw:chtrt5645" - ] } @@ -119,8 +103,6 @@ SectionDevice."HSMic".0 { } EnableSequence [ - cdev "hw:chtrt5645" - cset "name='Sto1 ADC MIXL ADC2 Switch' off" @@ -133,8 +115,6 @@ SectionDevice."HSMic".0 { ] DisableSequence [ - cdev "hw:chtrt5645" - 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 43cb4d6..be65174 100644 --- 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" - @@ -23,8 +21,6 @@ SectionVerb { ] DisableSequence [ - cdev "hw:chtrt5645" - ] } @@ -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" - cset "name='Sto1 ADC MIXL ADC2 Switch' off" @@ -115,8 +101,6 @@ SectionDevice."HSMic".0 { ] DisableSequence [ - cdev "hw:chtrt5645" - 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 53300f6..a6d79f6 100644 --- 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" - @@ -23,8 +21,6 @@ SectionVerb { ] DisableSequence [ - cdev "hw:chtrt5645" - ] } @@ -41,14 +37,10 @@ SectionDevice."Speaker" { ] EnableSequence [ - cdev "hw:chtrt5645" - ] 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" - ] 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" - cset "name='Sto1 ADC MIXL ADC2 Switch' off" @@ -107,8 +93,6 @@ SectionDevice."HSMic".0 { ] DisableSequence [ - cdev "hw:chtrt5645" - 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 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 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 5afe5f0..fc6c32f 100644 --- 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 50bda00..9bbebfa 100644 --- 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 b1a5206..aacce6c 100644 --- 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 dfc36c8..7de572a 100644 --- 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 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 cbcefa7..1e97980 100644 --- 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 -- 2.47.1