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

Revert "ucm2: Qualcomm: x1e80100: add USB DisplayPort playback" #453

Closed
wants to merge 1 commit into from
Closed

Revert "ucm2: Qualcomm: x1e80100: add USB DisplayPort playback" #453

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
61 changes: 0 additions & 61 deletions ucm2/Qualcomm/x1e80100/HiFi.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

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 @@ -41,24 +39,11 @@ 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 Down Expand Up @@ -106,49 +91,3 @@ 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"
}
}
Loading