Skip to content

sof-soundwire: split speaker configuration for 2 and 4ch cases #34

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

Merged
plbossart merged 1 commit into from
May 1, 2020
Merged

sof-soundwire: split speaker configuration for 2 and 4ch cases #34

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion ucm2/sof-soundwire/HiFi.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ SectionVerb {
<sof-soundwire/RT700.conf>
<sof-soundwire/RT711.conf>
<sof-soundwire/RT5682.conf>
<sof-soundwire/RT1308-1.conf>
<sof-soundwire/RT1308.conf>
<sof-soundwire/RT715.conf>
<sof-soundwire/Hdmi.conf>
44 changes: 17 additions & 27 deletions ucm2/sof-soundwire/RT1308-1.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,25 @@
# Use case Configuration for sof-soundwire card

If.RT1308-1 {
Condition {
Type String
Haystack "${CardComponents}"
Needle "spk:rt1308"
}
True {

SectionDevice."Speaker" {
Comment "Speaker"
SectionDevice."Speaker" {
Comment "Speaker"

EnableSequence [
cset "name='PGA3.0 3 Master Playback Volume' 50"
EnableSequence [
cset "name='PGA3.0 3 Master Playback Volume' 50"

cset "name='rt1308-1 DAC L Switch' 1"
cset "name='rt1308-1 DAC R Switch' 1"
cset "name='Speaker Switch' on"
]
cset "name='rt1308-1 DAC L Switch' 1"
cset "name='rt1308-1 DAC R Switch' 1"
cset "name='Speaker Switch' on"
]

DisableSequence [
cset "name='rt1308-1 DAC L Switch' 0"
cset "name='rt1308-1 DAC R Switch' 0"
cset "name='Speaker Switch' off"
]
DisableSequence [
cset "name='rt1308-1 DAC L Switch' 0"
cset "name='rt1308-1 DAC R Switch' 0"
cset "name='Speaker Switch' off"
]

Value {
PlaybackPriority 100
PlaybackPCM "hw:${CardId},2"
PlaybackChannels "2"
}
}
Value {
PlaybackPriority 100
PlaybackPCM "hw:${CardId},2"
PlaybackChannels "2"
}
}
32 changes: 32 additions & 0 deletions ucm2/sof-soundwire/RT1308-2.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Use case Configuration for sof-soundwire card

SectionDevice."Speaker" {
Comment "Speaker"

EnableSequence [
cset "name='PGA3.1 3 Master Playback Volume' 50"

cset "name='rt1308-1 RX Channel Select' LL"
cset "name='rt1308-2 RX Channel Select' RR"

cset "name='rt1308-1 DAC L Switch' 1"
cset "name='rt1308-1 DAC R Switch' 1"
cset "name='rt1308-2 DAC L Switch' 1"
cset "name='rt1308-2 DAC R Switch' 1"
cset "name='Speaker Switch' on"
]

DisableSequence [
cset "name='rt1308-1 DAC L Switch' 0"
cset "name='rt1308-1 DAC R Switch' 0"
cset "name='rt1308-2 DAC L Switch' 0"
cset "name='rt1308-2 DAC R Switch' 0"
cset "name='Speaker Switch' off"
]

Value {
PlaybackPriority 100
PlaybackPCM "hw:${CardId},2"
PlaybackChannels "2"
}
}
30 changes: 30 additions & 0 deletions ucm2/sof-soundwire/RT1308.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Use case Configuration for sof-soundwire card
# alsaucm -c sof-soundwire set _verb HiFi set _enadev Speaker

If.RT1308 {
Condition {
Type String
Haystack "${CardComponents}"
Needle "spk:rt1308"
}
True {

If.2ch {
Condition {
Type String
Haystack "${CardComponents}"
Needle "cfg-spk:2"
}
True {

<sof-soundwire/RT1308-1.conf>

}
False {

<sof-soundwire/RT1308-2.conf>

}
}
}
}