Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ucm2: Qualcomm: x1e80100: add USB DisplayPort playback #423

Closed
wants to merge 3 commits into from
Closed

ucm2: Qualcomm: x1e80100: add USB DisplayPort playback #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5da142c
ucm2: Qualcomm: x1e80100: add USB DisplayPort playback
krzk Jun 4, 2024
eab577b
ucm2: codecs: wcd938x: correct 'cset' command
krzk Jun 11, 2024
d8eefb4
ucm2: Qualcomm: x1e80100: add Headset capture
krzk Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 85 additions & 0 deletions ucm2/Qualcomm/x1e80100/HiFi.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

SectionVerb {
EnableSequence [
cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia1' 0"
cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia1' 0"
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"
Expand Down Expand Up @@ -39,11 +41,24 @@ SectionDevice."Speaker" {
SectionDevice."Headphones" {
Comment "Headphones playback"

ConflictingDevice [
"HDMI0"
"HDMI1"
]

Include.wcdhpe.File "/codecs/wcd938x/HeadphoneEnableSeq.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"
]

DisableSequence [
cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 0"
]

Value {
PlaybackPriority 200
PlaybackPCM "hw:${CardId},0"
Expand All @@ -54,9 +69,33 @@ SectionDevice."Headphones" {
}
}

SectionDevice."Headset" {
Comment "Headset microphone"

ConflictingDevice [
"Mic"
]

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"

ConflictingDevice [
"Headset"
]

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"
Expand All @@ -67,3 +106,49 @@ SectionDevice."Mic" {
CapturePCM "hw:${CardId},3"
}
}

SectionDevice."HDMI0" {
Comment "USB/DisplayPort 0 playback"

ConflictingDevice [
"Headphones"
"HDMI1"
]

EnableSequence [
cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia1' 1"
]

DisableSequence [
cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia1' 0"
]

Value {
PlaybackPriority 200
PlaybackPCM "hw:${CardId},0"
JackControl "DP0 Jack"
}
}

SectionDevice."HDMI1" {
Comment "USB/DisplayPort 1 playback"

ConflictingDevice [
"Headphones"
"HDMI0"
]

EnableSequence [
cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia1' 1"
]

DisableSequence [
cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia1' 0"
]

Value {
PlaybackPriority 100
PlaybackPCM "hw:${CardId},0"
JackControl "DP1 Jack"
}
}
2 changes: 1 addition & 1 deletion ucm2/codecs/wcd938x/HeadphoneMicDisableSeq.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
DisableSequence [
cset "name='ADC2_MIXER Switch' 0"
cset "name='ADC2 Switch' 0"
set "name='TX1 MODE' ADC_INVALID"
cset "name='TX1 MODE' ADC_INVALID"
]
2 changes: 1 addition & 1 deletion ucm2/codecs/wcd938x/HeadphoneMicEnableSeq.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ EnableSequence [
cset "name='HDR12 MUX' NO_HDR12"
cset "name='ADC2 MUX' INP2"
cset "name='ADC2 Switch' 1"
set "name='TX1 MODE' ADC_NORMAL"
cset "name='TX1 MODE' ADC_NORMAL"
]
Loading