Skip to content

Commit 4747bac

Browse files
terry182Chromeos LUCI
authored and
Chromeos LUCI
committed
ucm2: sof-hda-dsp: Add conditional checking for Mic jack node
HDA codecs could also be using one `Headphone Mic Jack` to indicate both headphone/headset mic status since it does not support differentiating those devices. Switch to using `JackControl` for mic node to avoid registering colliding jacks in CRAS. BUG=b:274068400 TEST=deploy and test Change-Id: I184e587a54aee69bc797040a306a0231bfd6c006 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/6126803 Tested-by: Terry Cheong <[email protected]> Reviewed-by: Steve Kendall <[email protected]> Commit-Queue: ChromeOS Auto Retry <[email protected]> Tested-by: [email protected] <[email protected]>
1 parent 77aa640 commit 4747bac

File tree

1 file changed

+13
-1
lines changed
  • ucm-config/for_all_boards_ucm2/sof-hda-dsp

1 file changed

+13
-1
lines changed

ucm-config/for_all_boards_ucm2/sof-hda-dsp/HiFi.conf

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,21 @@ SectionDevice."Speaker".0 {
165165
}
166166

167167
SectionDevice."Mic".0 {
168+
If.jackname {
169+
Condition {
170+
Type ControlExists
171+
Control "iface=CARD,name='Headphone Mic Jack'"
172+
}
173+
True.Define {
174+
miccontrol "Headphone Mic Jack"
175+
}
176+
False.Define {
177+
miccontrol "Mic Jack"
178+
}
179+
}
168180
Value {
169181
CapturePCM "hw:sofhdadsp,0"
170-
JackDev "sof-hda-dsp Mic"
182+
JackControl "${var:miccontrol}"
171183
}
172184
If.captureswitch {
173185
Condition {

0 commit comments

Comments
 (0)