@@ -2,11 +2,11 @@
LibraryConfig.remap.Config {
ctl.default.map {
- "name='cs42l43 PDM2 Switch'" {
+ "name='cs42l43 Microphone Capture Switch'" {
"name='cs42l43 Decimator 3 Switch'".vindex.0 0
"name='cs42l43 Decimator 4 Switch'".vindex.1 0
}
- "name='cs42l43 PDM2 Volume'" {
+ "name='cs42l43 Microphone Capture Volume'" {
"name='cs42l43 Decimator 3 Volume'".vindex.0 0
"name='cs42l43 Decimator 4 Volume'".vindex.1 0
}
@@ -2,11 +2,11 @@
LibraryConfig.remap.Config {
ctl.default.map {
- "name='Speaker Digital Switch'" {
+ "name='Speaker Combined Switch'" {
"name='AMPL Speaker Switch'".vindex.0 0
"name='AMPR Speaker Switch'".vindex.1 0
}
- "name='Speaker Digital Volume'" {
+ "name='Speaker Combined Volume'" {
"name='AMPL Speaker Volume'".vindex.0 0
"name='AMPR Speaker Volume'".vindex.1 0
}
@@ -56,6 +56,6 @@ SectionDevice."Speaker" {
PlaybackPriority 100
PlaybackPCM "hw:${CardId},0"
PlaybackMixer "default:${CardId}"
- PlaybackMixerElem "Speaker Digital"
+ PlaybackMixerElem "Speaker Combined"
}
}
@@ -21,6 +21,6 @@ SectionDevice."Mic" {
CapturePriority 100
CapturePCM "hw:${CardId},4"
CaptureMixer "default:${CardId}"
- CaptureMixerElem "cs42l43 PDM2"
+ CaptureMixerElem "cs42l43 Microphone"
}
}
Both 'Speaker Digital' and 'cs42l43 PDM2' names were found as substrings in other alsa controls, confusing the MixerElems paths. Make them unique to avoid errors for hardware mutes. Also add 'Capture' string into microphone controls to make them work properly. Fixes: e87dde51d689 ("sof-soundwire: Add basic support for cs42l43") Fixes: e4277a204cd6 ("sof-soundwire: Add support for cs42l43/cs35l56 bridge configuration") Signed-off-by: Maciej Strozek <mstrozek@opensource.cirrus.com> --- ucm2/codecs/cs42l43/init.conf | 4 ++-- ucm2/sof-soundwire/cs35l56-bridge.conf | 6 +++--- ucm2/sof-soundwire/cs42l43-dmic.conf | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) -- 2.39.5