d4989eb508
Align UCM with the topology change that added dedicated multimedia
frontends for DisplayPort (commit c8d6762 "ASoC: qcom:
x1e80100-LENOVO-Thinkpad-T14s: add dedicated multimedia frontend for
DisplayPort").
- SectionVerb EnableSequence: enable DISPLAY_PORT_RX_0/1/2 on
MultiMedia5/6/7 (remove the old MultiMedia1 "0" settings).
- Headphones: disable the DP mixers on the new dedicated streams.
- HDMI0/1/2 devices: route each DISPLAY_PORT_RX_* to its own
MultiMedia frontend, use dedicated PlaybackPCM "hw:${CardId},4/5/6",
add explicit PlaybackChannels 2, and keep the existing JackControl.
This gives independent DP audio streams and matches the new topology.
Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/754
Signed-off-by: Jens Glathe <jens.glathe@oldschoolsolutions.biz>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
188 lines
4.6 KiB
Text
188 lines
4.6 KiB
Text
# Use case configuration for X1E80100.
|
|
# Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
|
|
|
SectionVerb {
|
|
EnableSequence [
|
|
cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 1"
|
|
cset "name='WSA_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' 1"
|
|
cset "name='MultiMedia3 Mixer TX_CODEC_DMA_TX_3' 1"
|
|
cset "name='MultiMedia4 Mixer VA_CODEC_DMA_TX_0' 1"
|
|
cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia5' 1"
|
|
cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia6' 1"
|
|
cset "name='DISPLAY_PORT_RX_2 Audio Mixer MultiMedia7' 1"
|
|
]
|
|
|
|
Include.wsae.File "/codecs/wsa884x/two-speakers/DefaultEnableSeq.conf"
|
|
Include.wsm1e.File "/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerEnableSeq.conf"
|
|
|
|
Value {
|
|
TQ "HiFi"
|
|
}
|
|
}
|
|
|
|
SectionDevice."Speaker" {
|
|
Comment "Speaker playback"
|
|
|
|
Include.wsmspk1e.File "/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerEnableSeq.conf"
|
|
Include.wsmspk1d.File "/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerDisableSeq.conf"
|
|
Include.wsaspk.File "/codecs/wsa884x/two-speakers/SpeakerSeq.conf"
|
|
|
|
Value {
|
|
PlaybackChannels 2
|
|
PlaybackPriority 100
|
|
PlaybackPCM "hw:${CardId},1"
|
|
PlaybackMixer "default:${CardId}"
|
|
PlaybackMixerElem "Speakers"
|
|
}
|
|
}
|
|
|
|
SectionDevice."Headphones" {
|
|
Comment "Headphones playback"
|
|
|
|
ConflictingDevice [
|
|
"HDMI0"
|
|
"HDMI1"
|
|
"HDMI2"
|
|
]
|
|
|
|
Include.wcdhpe.File "/codecs/wcd938x/HeadphoneABEnableSeq.conf"
|
|
Include.wcdhpd.File "/codecs/wcd938x/HeadphoneDisableSeq.conf"
|
|
Include.rxmhpe.File "/codecs/qcom-lpass/rx-macro/HeadphoneEnableSeq.conf"
|
|
Include.rxmhpd.File "/codecs/qcom-lpass/rx-macro/HeadphoneDisableSeq.conf"
|
|
|
|
EnableSequence [
|
|
cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 1"
|
|
cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia5' 0"
|
|
cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia6' 0"
|
|
cset "name='DISPLAY_PORT_RX_2 Audio Mixer MultiMedia7' 0"
|
|
]
|
|
|
|
DisableSequence [
|
|
cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 0"
|
|
]
|
|
|
|
Value {
|
|
PlaybackPriority 200
|
|
PlaybackPCM "hw:${CardId},0"
|
|
PlaybackMixer "default:${CardId}"
|
|
PlaybackMixerElem "HP"
|
|
JackControl "Headphone Jack"
|
|
}
|
|
}
|
|
|
|
SectionDevice."Headset" {
|
|
Comment "Headset microphone"
|
|
|
|
Include.wcdmice.File "/codecs/wcd938x/HeadphoneMicEnableSeq.conf"
|
|
Include.wcdmicd.File "/codecs/wcd938x/HeadphoneMicDisableSeq.conf"
|
|
Include.txmhpe.File "/codecs/qcom-lpass/tx-macro/SoundwireMic1EnableSeq.conf"
|
|
Include.txmhpd.File "/codecs/qcom-lpass/tx-macro/SoundwireMicDisableSeq.conf"
|
|
|
|
Value {
|
|
CapturePriority 200
|
|
CapturePCM "hw:${CardId},2"
|
|
CaptureMixerElem "ADC2"
|
|
JackControl "Mic Jack"
|
|
}
|
|
}
|
|
|
|
SectionDevice."Mic" {
|
|
Comment "Internal microphones"
|
|
|
|
Include.vadm0e.File "/codecs/qcom-lpass/va-macro/DMIC0EnableSeq.conf"
|
|
Include.vadm0d.File "/codecs/qcom-lpass/va-macro/DMIC0DisableSeq.conf"
|
|
Include.vadm1e.File "/codecs/qcom-lpass/va-macro/DMIC1EnableSeq.conf"
|
|
Include.vadm1d.File "/codecs/qcom-lpass/va-macro/DMIC1DisableSeq.conf"
|
|
|
|
Value {
|
|
CapturePriority 100
|
|
CapturePCM "hw:${CardId},3"
|
|
}
|
|
}
|
|
|
|
SectionDevice."HDMI0" {
|
|
Comment "USB/DisplayPort 0 playback"
|
|
|
|
ConflictingDevice [
|
|
"Headphones"
|
|
"HDMI1"
|
|
"HDMI2"
|
|
]
|
|
|
|
EnableSequence [
|
|
cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 0"
|
|
cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia5' 1"
|
|
cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia6' 0"
|
|
cset "name='DISPLAY_PORT_RX_2 Audio Mixer MultiMedia7' 0"
|
|
]
|
|
|
|
DisableSequence [
|
|
cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia5' 0"
|
|
]
|
|
|
|
Value {
|
|
PlaybackPriority 200
|
|
PlaybackPCM "hw:${CardId},4"
|
|
JackControl "DP0 Jack"
|
|
PlaybackChannels 2
|
|
JackControl "DP0 Jack"
|
|
}
|
|
}
|
|
|
|
SectionDevice."HDMI1" {
|
|
Comment "USB/DisplayPort 1 playback"
|
|
|
|
ConflictingDevice [
|
|
"Headphones"
|
|
"HDMI0"
|
|
"HDMI2"
|
|
]
|
|
|
|
EnableSequence [
|
|
cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 0"
|
|
cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia5' 0"
|
|
cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia6' 1"
|
|
cset "name='DISPLAY_PORT_RX_2 Audio Mixer MultiMedia7' 0"
|
|
]
|
|
|
|
DisableSequence [
|
|
cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia6' 0"
|
|
]
|
|
|
|
Value {
|
|
PlaybackPriority 200
|
|
PlaybackPCM "hw:${CardId},5"
|
|
JackControl "DP1 Jack"
|
|
PlaybackChannels 2
|
|
JackControl "DP1 Jack"
|
|
}
|
|
}
|
|
|
|
SectionDevice."HDMI2" {
|
|
Comment "HDMI playback"
|
|
|
|
ConflictingDevice [
|
|
"Headphones"
|
|
"HDMI0"
|
|
"HDMI1"
|
|
]
|
|
|
|
EnableSequence [
|
|
cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 0"
|
|
cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia5' 0"
|
|
cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia6' 0"
|
|
cset "name='DISPLAY_PORT_RX_2 Audio Mixer MultiMedia7' 1"
|
|
]
|
|
|
|
DisableSequence [
|
|
cset "name='DISPLAY_PORT_RX_2 Audio Mixer MultiMedia7' 0"
|
|
]
|
|
|
|
Value {
|
|
PlaybackPriority 200
|
|
PlaybackPCM "hw:${CardId},6"
|
|
JackControl "DP2 Jack"
|
|
PlaybackChannels 2
|
|
JackControl "DP2 Jack"
|
|
}
|
|
}
|