tgl/*: use dmi matching, add rt5682vs variant of delbin

pull/1/head
WeirdTreeThing 2023-06-17 23:17:26 -04:00
parent 50e62ed667
commit 5ecf083933
No known key found for this signature in database
GPG Key ID: 1F56A4B52998B851
14 changed files with 232 additions and 175 deletions

View File

@ -1,8 +0,0 @@
Syntax 6
Comment "Tigerlake internal card"
SectionUseCase."HiFi" {
File "HiFi-Delbin.conf"
Comment "Default"
}

View File

@ -1,8 +0,0 @@
Syntax 6
Comment "Tigerlake internal card"
SectionUseCase."HiFi" {
File "HiFi-Delbin.conf"
Comment "Default"
}

View File

@ -1,8 +0,0 @@
Syntax 6
Comment "Tigerlake internal card"
SectionUseCase."HiFi" {
File "HiFi-Eldrid.conf"
Comment "Default"
}

View File

@ -1,8 +0,0 @@
Syntax 6
Comment "Tigerlake internal card"
SectionUseCase."HiFi" {
File "HiFi-Elemi.conf"
Comment "Default"
}

View File

@ -1,8 +0,0 @@
Syntax 6
Comment "Tigerlake internal card"
SectionUseCase."HiFi" {
File "HiFi-Lillipup.conf"
Comment "Default"
}

View File

@ -1,8 +0,0 @@
Syntax 6
Comment "Tigerlake internal card"
SectionUseCase."HiFi" {
File "HiFi-Lillipup.conf"
Comment "Default"
}

View File

@ -1,8 +0,0 @@
Syntax 6
Comment "Tigerlake internal card"
SectionUseCase."HiFi" {
File "HiFi-Lillipup.conf"
Comment "Default"
}

View File

@ -1,114 +0,0 @@
SectionVerb {
Value {
FullySpecifiedUCM "1"
}
EnableSequence [
cset "name='Left DAI Sel Mux' Right"
cset "name='Right DAI Sel Mux' Left"
cset "name='Left Digital Volume' 127"
cset "name='Right Digital Volume' 127"
cset "name='Left FS Max Volume' 7"
cset "name='Right FS Max Volume' 7"
cset "name='Headphone Jack Switch' off"
cset "name='HPOL Playback Switch' off"
cset "name='HPOR Playback Switch' off"
cset "name='Stereo1 DAC MIXL DAC L1 Switch' 1"
cset "name='Stereo1 DAC MIXR DAC R1 Switch' 1"
cset "name='Stereo1 ADC L Mux' 0"
cset "name='STO1 ADC Capture Switch' on"
cset "name='RECMIX1L CBJ Switch' 1"
cset "name='IF1 01 ADC Swap Mux' 2"
cset "name='CBJ Boost Volume' 3"
cset "name='Stereo1 ADC L1 Mux' 1"
cset "name='Stereo1 ADC R1 Mux' 1"
cset "name='Stereo1 ADC MIXL ADC2 Switch' 0"
cset "name='Stereo1 ADC MIXR ADC2 Switch' 0"
cset "name='Stereo1 ADC MIXL ADC1 Switch' 1"
cset "name='Stereo1 ADC MIXR ADC1 Switch' 1"
]
DisableSequence [
]
}
SectionDevice."Speaker" {
Comment "Speaker"
Value {
PlaybackPriority 100
PlaybackPCM "hw:sofrt5682"
EchoReferenceDev "Echo Reference"
}
EnableSequence [
cset "name='Left VI Sense Switch' on"
cset "name='Left Spk Switch' on"
cset "name='Right VI Sense Switch' on"
cset "name='Right Spk Switch' on"
]
DisableSequence [
cset "name='Left VI Sense Switch' off"
cset "name='Left Spk Switch' off"
cset "name='Right VI Sense Switch' off"
cset "name='Right Spk Switch' off"
]
}
SectionDevice."Headphones" {
Comment "Headphones"
Value {
PlaybackPriority 200
PlaybackPCM "hw:sofrt5682,1"
PlaybackMixerElem "DAC1"
JackControl "Headphone Jack"
}
EnableSequence [
cset "name='Headphone Jack Switch' on"
cset "name='HPOL Playback Switch' 1"
cset "name='HPOR Playback Switch' 1"
]
DisableSequence [
cset "name='Headphone Jack Switch' off"
cset "name='HPOL Playback Switch' 0"
cset "name='HPOR Playback Switch' 0"
]
}
SectionDevice."Echo Reference" {
Comment "Echo Reference"
Value {
CapturePCM "hw:sofrt5682,0"
}
}
SectionDevice."Mic" {
Comment "Internal Microphone"
Value {
CapturePriority 100
CapturePCM "hw:sofrt5682,99"
CaptureChannels 4
}
}
SectionDevice."Headset" {
Comment "Headset Microphone"
Value {
CapturePriority 200
CapturePCM "hw:sofrt5682,1"
CaptureMixerElem "Headset Mic"
JackControl "Headset Mic Jack"
}
EnableSequence [
cset "name='Headset Mic Switch' on"
]
DisableSequence [
cset "name='Headset Mic Switch' off"
]
}
Include.hdmi.File "/conf.d/hdmi-common/hdmi345.conf"

View File

@ -0,0 +1,173 @@
SectionVerb {
Value {
FullySpecifiedUCM "1"
}
EnableSequence [
cset "name='Left DAI Sel Mux' Right"
cset "name='Right DAI Sel Mux' Left"
cset "name='Left Digital Volume' 127"
cset "name='Right Digital Volume' 127"
cset "name='Left FS Max Volume' 7"
cset "name='Right FS Max Volume' 7"
cset "name='Stereo1 DAC MIXL DAC L1 Switch' off"
cset "name='Stereo1 DAC MIXR DAC R1 Switch' off"
cset "name='RECMIX1L CBJ Switch' on"
cset "name='IF1 01 ADC Swap Mux' L/L"
cset "name='CBJ Boost Volume' 28"
cset "name='Stereo1 ADC L Mux' ADC1 L"
cset "name='Stereo1 ADC L1 Mux' ADC"
cset "name='Stereo1 ADC MIXL ADC2 Switch' off"
cset "name='Stereo1 ADC MIXL ADC1 Switch' on"
]
}
# Split 4ch dmic into 2 virtual 2ch mics
Include.pcm_split.File "/conf.d/dmic-common/split.conf"
Macro [
{
SplitPCM {
Name "tgl_stereo_in"
Direction Capture
Format S32_LE
Channels 2
HWChannels 4
HWChannelPos0 FL
HWChannelPos1 FR
HWChannelPos2 FL
HWChannelPos3 FR
}
}
]
Include.ctl_remap.File "/conf.d/dmic-common/remap.conf"
Macro [
{
CtlRemapStereoVolSw {
Dst "Mic 1 Capture"
Src "STO1 ADC Capture"
Index0 0
Index1 1
}
}
{
CtlRemapStereoVolSw {
Dst "Mic 2 Capture"
Src "STO1 ADC Capture"
Index0 2
Index1 3
}
}
]
SectionDevice."Speaker" {
Comment "Speaker"
Value {
PlaybackPriority 100
PlaybackPCM "hw:${CardId},0"
EchoReferenceDev "Echo Reference"
}
EnableSequence [
cset "name='Left VI Sense Switch' on"
cset "name='Right VI Sense Switch' on"
]
DisableSequence [
cset "name='Left VI Sense Switch' off"
cset "name='Right VI Sense Switch' off"
]
}
SectionDevice."Headphones" {
Comment "Headphones"
Value {
PlaybackPriority 200
PlaybackPCM "hw:${CardId},1"
PlaybackMixerElem "DAC1"
JackControl "Headphone Jack"
}
EnableSequence [
cset "name='Headphone Jack Switch' on"
cset "name='Stereo1 DAC MIXL DAC L1 Switch' 1"
cset "name='Stereo1 DAC MIXR DAC R1 Switch' 1"
]
DisableSequence [
cset "name='Headphone Jack Switch' off"
cset "name='Stereo1 DAC MIXL DAC L1 Switch' 0"
cset "name='Stereo1 DAC MIXR DAC R1 Switch' 0"
]
}
SectionDevice."Echo Reference" {
Comment "Echo Reference"
Value {
CapturePCM "hw:${CardId},0"
}
}
SectionDevice."Mic" {
Comment "Front Mic"
Value {
CapturePriority 100
CapturePCM "hw:${CardId},99"
CaptureChannels 4
}
Macro.pcm_split.SplitPCMDevice {
Name "tgl_stereo_in"
Direction Capture
Device 99
HWChannels 4
Channels 2
Channel0 1
Channel1 0
ChannelPos0 FL
ChannelPos1 FR
}
}
SectionDevice."Mic 1" {
Comment "Rear Mic"
Value {
CapturePriority 100
CapturePCM "hw:${CardId},99"
CaptureChannels 4
}
Macro.pcm_split.SplitPCMDevice {
Name "tgl_stereo_in"
Direction Capture
Device 99
HWChannels 4
Channels 2
Channel0 2
Channel1 2
ChannelPos0 FL
ChannelPos1 FR
}
}
SectionDevice."Headset" {
Comment "Headset Microphone"
Value {
CapturePriority 200
CapturePCM "hw:${CardId},1"
CaptureMixerElem "Headset Mic"
JackControl "Headset Mic Jack"
}
EnableSequence [
cset "name='Headset Mic Switch' on"
]
DisableSequence [
cset "name='Headset Mic Switch' off"
]
}
Include.hdmi.File "/conf.d/hdmi-common/hdmi2345.conf"

View File

@ -1,8 +1,62 @@
Syntax 6
Comment "Tigerlake internal card"
SectionUseCase."HiFi" {
File "HiFi.conf"
If.delbin {
Condition {
Type String
Haystack "${sys:devices/virtual/dmi/id/product_name}"
Needle "Delbin"
}
True {
If.rt5682vs {
Condition {
Type RegexMatch
Regex "^sku(65541)$"
String "${sys:devices/virtual/dmi/id/product_sku}"
}
True.SectionUseCase."HiFi" {
File "HiFi.delbin.rt5682vs.conf"
Comment "Default"
}
False.SectionUseCase."HiFi" {
File "HiFi.delbin.conf"
Comment "Default"
}
}
}
}
If.elemi {
Condition {
Type String
Haystack "${sys:devices/virtual/dmi/id/product_name}"
Needle "Elemi"
}
True.SectionUseCase."HiFi" {
File "HiFi.elemi.conf"
Comment "Default"
}
}
If.eldrid {
Condition {
Type String
Haystack "${sys:devices/virtual/dmi/id/product_name}"
Needle "Eldrid"
}
True.SectionUseCase."HiFi" {
File "HiFi.eldrid.conf"
Comment "Default"
}
}
If.lillipup {
Condition {
Type RegexMatch
Regex "^(Lillipup|Lindar)$"
String "${sys:devices/virtual/dmi/id/product_name}"
}
True.SectionUseCase."HiFi" {
File "HiFi.lillipup.conf"
Comment "Default"
}
}