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.

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

ucm2: sof-soundwire: add rt712 VA device #435

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions ucm2/codecs/rt712-dmic/init.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# RT712-dmic specific volume control settings

BootSequence [
cset "name='rt712-dmic ADC 25 Mux' 'DMIC1'"
cset "name='rt712-dmic FU1E Capture Switch' 1"
]
8 changes: 8 additions & 0 deletions ucm2/codecs/rt712/init.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# RT712 specific volume control settings

BootSequence [
cset "name='rt712 FU05 Playback Volume' 87"
cset "name='rt712 ADC 23 Mux' 'MIC2'"
cset "name='rt712 FU0F Capture Volume' 57"
cset "name='rt712 FU0F Capture Switch' 1"
]
21 changes: 21 additions & 0 deletions ucm2/sof-soundwire/rt712-dmic.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Use case Configuration for sof-soundwire card

SectionDevice."Mic" {
Comment "SoundWire microphones"

EnableSequence [
cset "name='rt712-dmic FU1E Capture Switch' 1"
]

DisableSequence [
cset "name='rt712-dmic FU1E Capture Switch' 0"
]

Value {
CapturePriority 100
CapturePCM "hw:${CardId},4"
CaptureSwitch "rt712-dmic FU1E Capture Switch"
CaptureVolume "rt712-dmic FU1E Capture Volume"
CaptureMixerElem "rt712-dmic FU1E"
}
}
87 changes: 87 additions & 0 deletions ucm2/sof-soundwire/rt712.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
# Use case Configuration for sof-soundwire card

If.codecspk {
Condition {
Type RegexMatch
Regex "(rt712(-sdca)?)"
String "${var:MultiSpeakerShadow}"
}
True {
SectionDevice."Speaker" {
Comment "Speaker"

If.lrswitch {
Condition {
Type ControlExists
Control "name='rt712 OT23 L Switch'"
}
True {
EnableSequence [
cset "name='rt712 OT23 L Switch' on"
cset "name='rt712 OT23 R Switch' on"
cset "name='Speaker Switch' on"
]
DisableSequence [
cset "name='rt712 OT23 L Switch' off"
cset "name='rt712 OT23 R Switch' off"
cset "name='Speaker Switch' off"
]
}
False {
EnableSequence [
cset "name='rt712 FU06 Switch' on"
cset "name='Speaker Switch' on"
]
DisableSequence [
cset "name='rt712 FU06 Switch' off"
cset "name='Speaker Switch' off"
]
}
}

Value {
PlaybackPriority 100
PlaybackPCM "hw:${CardId},2"
}
}
}
}

SectionDevice."Headphones" {
Comment "Headphones"

EnableSequence [
cset "name='Headphone Switch' on"
]

DisableSequence [
cset "name='Headphone Switch' off"
]

Value {
PlaybackPriority 200
PlaybackPCM "hw:${CardId}"
JackControl "Headphone Jack"
}
}

SectionDevice."Headset" {
Comment "Headset Mono Microphone"

EnableSequence [
cset "name='rt712 FU0F Capture Switch' on"
]

DisableSequence [
cset "name='rt712 FU0F Capture Switch' off"
]

Value {
CapturePriority 300
CapturePCM "hw:${CardId},1"
CaptureSwitch "rt712 FU0F Capture Switch"
CaptureVolume "rt712 FU0F Capture Volume"
CaptureMixerElem "rt712 FU0F"
JackControl "Headset Mic Jack"
}
}
4 changes: 2 additions & 2 deletions ucm2/sof-soundwire/sof-soundwire.conf
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ DefineRegex {
String "${CardComponents}"
}
MultiCodec {
Regex "(rt722(-sdca)?)"
Regex "(rt712|rt722(-sdca)?)"
String "${var:SpeakerCodec1} ${var:HeadsetCodec1} ${var:MicCodec1}"
}
}
Expand Down Expand Up @@ -114,7 +114,7 @@ If.hs_init {
If.mic_init {
Condition {
Type RegexMatch
Regex "(rt713-dmic|rt715(-sdca)?)"
Regex "(rt712-dmic|rt713-dmic|rt715(-sdca)?)"
String "${var:MicCodec1}"
}
True.Include.mic_init.File "/codecs/${var:MicCodec1}/init.conf"
Expand Down
Loading