chtrt5645: adapt to ucm2

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2019-11-21 14:14:08 +01:00
commit 3112e66a86
23 changed files with 18 additions and 88 deletions

View file

@ -1 +0,0 @@
../chtrt5645-mono-speaker-analog-mic/chtrt5645-mono-speaker-analog-mic.conf

View file

@ -1 +0,0 @@
../chtrt5645-mono-speaker-analog-mic/chtrt5645-mono-speaker-analog-mic.conf

View file

@ -0,0 +1 @@
chtrt5645-dmic1.conf

View file

@ -4,13 +4,11 @@ SectionVerb {
TQ "HiFi" TQ "HiFi"
# ALSA PCM device for HiFi # ALSA PCM device for HiFi
PlaybackPCM "hw:chtrt5645" PlaybackPCM "hw:${CardId}"
CapturePCM "hw:chtrt5645" CapturePCM "hw:${CardId}"
} }
EnableSequence [ EnableSequence [
cdev "hw:chtrt5645"
<platforms/bytcr/PlatformEnableSeq.conf> <platforms/bytcr/PlatformEnableSeq.conf>
<codecs/rt5645/EnableSeq.conf> <codecs/rt5645/EnableSeq.conf>
@ -23,8 +21,6 @@ SectionVerb {
] ]
DisableSequence [ DisableSequence [
cdev "hw:chtrt5645"
<codecs/rt5645/DisableSeq.conf> <codecs/rt5645/DisableSeq.conf>
] ]
} }
@ -41,14 +37,10 @@ SectionDevice."Speaker" {
] ]
EnableSequence [ EnableSequence [
cdev "hw:chtrt5645"
<codecs/rt5645/SpeakerEnableSeq.conf> <codecs/rt5645/SpeakerEnableSeq.conf>
] ]
DisableSequence [ DisableSequence [
cdev "hw:chtrt5645"
cset "name='Ext Spk Switch' off" cset "name='Ext Spk Switch' off"
cset "name='Speaker Channel Switch' off" cset "name='Speaker Channel Switch' off"
] ]
@ -68,14 +60,10 @@ SectionDevice."Headphones" {
] ]
EnableSequence [ EnableSequence [
cdev "hw:chtrt5645"
<codecs/rt5645/HeadphonesEnableSeq.conf> <codecs/rt5645/HeadphonesEnableSeq.conf>
] ]
DisableSequence [ DisableSequence [
cdev "hw:chtrt5645"
cset "name='Headphone Switch' off" cset "name='Headphone Switch' off"
cset "name='Headphone Channel Switch' off" cset "name='Headphone Channel Switch' off"
] ]
@ -90,8 +78,6 @@ SectionDevice."DMic".0 {
} }
EnableSequence [ EnableSequence [
cdev "hw:chtrt5645"
<codecs/rt5645/DigitalMicEnableSeq.conf> <codecs/rt5645/DigitalMicEnableSeq.conf>
cset "name='Stereo1 DMIC Mux' DMIC1" cset "name='Stereo1 DMIC Mux' DMIC1"
@ -101,8 +87,6 @@ SectionDevice."DMic".0 {
] ]
DisableSequence [ DisableSequence [
cdev "hw:chtrt5645"
<codecs/rt5645/DigitalMicDisableSeq.conf> <codecs/rt5645/DigitalMicDisableSeq.conf>
] ]
} }
@ -117,8 +101,6 @@ SectionDevice."HSMic".0 {
} }
EnableSequence [ EnableSequence [
cdev "hw:chtrt5645"
<codecs/rt5645/HSMicEnableSeq.conf> <codecs/rt5645/HSMicEnableSeq.conf>
cset "name='Sto1 ADC MIXL ADC2 Switch' off" cset "name='Sto1 ADC MIXL ADC2 Switch' off"
@ -131,8 +113,6 @@ SectionDevice."HSMic".0 {
] ]
DisableSequence [ DisableSequence [
cdev "hw:chtrt5645"
<codecs/rt5645/HSMicEnableSeq.conf> <codecs/rt5645/HSMicEnableSeq.conf>
cset "name='Mono ADC MIXL ADC1 Switch' on" cset "name='Mono ADC MIXL ADC1 Switch' on"

View file

@ -4,13 +4,11 @@ SectionVerb {
TQ "HiFi" TQ "HiFi"
# ALSA PCM device for HiFi # ALSA PCM device for HiFi
PlaybackPCM "hw:chtrt5645" PlaybackPCM "hw:${CardId}"
CapturePCM "hw:chtrt5645" CapturePCM "hw:${CardId}"
} }
EnableSequence [ EnableSequence [
cdev "hw:chtrt5645"
<platforms/bytcr/PlatformEnableSeq.conf> <platforms/bytcr/PlatformEnableSeq.conf>
<codecs/rt5645/EnableSeq.conf> <codecs/rt5645/EnableSeq.conf>
@ -23,8 +21,6 @@ SectionVerb {
] ]
DisableSequence [ DisableSequence [
cdev "hw:chtrt5645"
<codecs/rt5645/DisableSeq.conf> <codecs/rt5645/DisableSeq.conf>
] ]
} }
@ -41,14 +37,10 @@ SectionDevice."Speaker" {
] ]
EnableSequence [ EnableSequence [
cdev "hw:chtrt5645"
<codecs/rt5645/SpeakerEnableSeq.conf> <codecs/rt5645/SpeakerEnableSeq.conf>
] ]
DisableSequence [ DisableSequence [
cdev "hw:chtrt5645"
cset "name='Ext Spk Switch' off" cset "name='Ext Spk Switch' off"
cset "name='Speaker Channel Switch' off" cset "name='Speaker Channel Switch' off"
] ]
@ -68,14 +60,10 @@ SectionDevice."Headphones" {
] ]
EnableSequence [ EnableSequence [
cdev "hw:chtrt5645"
<codecs/rt5645/HeadphonesEnableSeq.conf> <codecs/rt5645/HeadphonesEnableSeq.conf>
] ]
DisableSequence [ DisableSequence [
cdev "hw:chtrt5645"
cset "name='Headphone Switch' off" cset "name='Headphone Switch' off"
cset "name='Headphone Channel Switch' off" cset "name='Headphone Channel Switch' off"
] ]
@ -90,8 +78,6 @@ SectionDevice."DMic".0 {
} }
EnableSequence [ EnableSequence [
cdev "hw:chtrt5645"
<codecs/rt5645/DigitalMicEnableSeq.conf> <codecs/rt5645/DigitalMicEnableSeq.conf>
cset "name='Stereo1 DMIC Mux' DMIC2" cset "name='Stereo1 DMIC Mux' DMIC2"
@ -103,8 +89,6 @@ SectionDevice."DMic".0 {
] ]
DisableSequence [ DisableSequence [
cdev "hw:chtrt5645"
<codecs/rt5645/DigitalMicDisableSeq.conf> <codecs/rt5645/DigitalMicDisableSeq.conf>
] ]
} }
@ -119,8 +103,6 @@ SectionDevice."HSMic".0 {
} }
EnableSequence [ EnableSequence [
cdev "hw:chtrt5645"
<codecs/rt5645/HSMicEnableSeq.conf> <codecs/rt5645/HSMicEnableSeq.conf>
cset "name='Sto1 ADC MIXL ADC2 Switch' off" cset "name='Sto1 ADC MIXL ADC2 Switch' off"
@ -133,8 +115,6 @@ SectionDevice."HSMic".0 {
] ]
DisableSequence [ DisableSequence [
cdev "hw:chtrt5645"
<codecs/rt5645/HSMicEnableSeq.conf> <codecs/rt5645/HSMicEnableSeq.conf>
cset "name='Mono ADC MIXL ADC1 Switch' on" cset "name='Mono ADC MIXL ADC1 Switch' on"

View file

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

View file

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

View file

@ -0,0 +1 @@
chtrt5645-dmic2.conf

View file

@ -0,0 +1 @@
chtrt5645-mono-speaker-analog-mic.conf

View file

@ -1,5 +1,6 @@
Syntax 2
Comment "Intel SoC Audio Device" Comment "Intel SoC Audio Device"
SectionUseCase."HiFi" { SectionUseCase."HiFi" {
File "../ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf" File "HiFi-dmic1.conf"
Comment "Default" Comment "Default"
} }

View file

@ -1,3 +1,4 @@
Syntax 2
Comment "Intel SoC Audio Device" Comment "Intel SoC Audio Device"
SectionUseCase."HiFi" { SectionUseCase."HiFi" {
File "../LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf" File "../LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf"

View file

@ -1,5 +1,6 @@
Syntax 2
Comment "Intel SoC Audio Device" Comment "Intel SoC Audio Device"
SectionUseCase."HiFi" { SectionUseCase."HiFi" {
File "../chtrt5645-mono-speaker-analog-mic/HiFi.conf" File "HiFi-mono-speaker-analog-mic.conf"
Comment "Default" Comment "Default"
} }

View file

@ -1,3 +1,4 @@
Syntax 2
Comment "Intel SoC Audio Device" Comment "Intel SoC Audio Device"
SectionUseCase."HiFi" { SectionUseCase."HiFi" {
File "HiFi.conf" File "HiFi.conf"

View file

@ -0,0 +1 @@
chtrt5645-mono-speaker-analog-mic.conf

View file

@ -7,8 +7,6 @@ SectionDevice."Mic".0 {
} }
EnableSequence [ EnableSequence [
cdev "hw:chtrt5645"
cset "name='Int Analog Mic Switch' on" cset "name='Int Analog Mic Switch' on"
cset "name='Sto1 ADC MIXL ADC1 Switch' on" cset "name='Sto1 ADC MIXL ADC1 Switch' on"
@ -26,8 +24,6 @@ SectionDevice."Mic".0 {
] ]
DisableSequence [ DisableSequence [
cdev "hw:chtrt5645"
cset "name='Sto1 ADC MIXL ADC1 Switch' off" cset "name='Sto1 ADC MIXL ADC1 Switch' off"
cset "name='Sto1 ADC MIXR ADC1 Switch' off" cset "name='Sto1 ADC MIXR ADC1 Switch' off"
cset "name='Mono ADC MIXL ADC1 Switch' off" cset "name='Mono ADC MIXL ADC1 Switch' off"