sof-soundwire: Change map control names to make them unique and user friendly

Both 'Speaker Digital' and 'cs42l43 PDM2' names were found 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.

Link: https://lore.kernel.org/alsa-devel/20241017122027.1207373-1-mstrozek@opensource.cirrus.com/
Signed-off-by: Maciej Strozek <mstrozek@opensource.cirrus.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/codecs/cs42l43/init.conf b/ucm2/codecs/cs42l43/init.conf
index 10a6e1f351ab0729acd418fca2536d9615139338..b2796e202bfac61e49196fc1aac9c1b1084d7118 100644 (file)
--- a/ucm2/codecs/cs42l43/init.conf
+++ b/ucm2/codecs/cs42l43/init.conf
@@ -2,13 +2,19 @@
 
 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
                }
+               "name='cs42l43 Headset Microphone Capture Switch'" {
+                       "name='cs42l43 Decimator 1 Switch'".vindex.0 0
+               }
+               "name='cs42l43 Headset Microphone Capture Volume'" {
+                       "name='cs42l43 Decimator 1 Volume'".vindex.0 0
+               }
        }
 }

diff --git a/ucm2/sof-soundwire/cs35l56-bridge.conf b/ucm2/sof-soundwire/cs35l56-bridge.conf
index 5435b113b964124ace28b4789734ae822df758b1..176f8801cce6e50023ab9bdca8c5c2974aea9753 100644 (file)
--- a/ucm2/sof-soundwire/cs35l56-bridge.conf
+++ b/ucm2/sof-soundwire/cs35l56-bridge.conf
@@ -2,11 +2,11 @@
 
 LibraryConfig.remap.Config {
        ctl.default.map {
-               "name='Speaker Digital Switch'" {
+               "name='Speaker Playback Switch'" {
                        "name='AMPL Speaker Switch'".vindex.0 0
                        "name='AMPR Speaker Switch'".vindex.1 0
                }
-               "name='Speaker Digital Volume'" {
+               "name='Speaker Playback 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"
        }
 }

diff --git a/ucm2/sof-soundwire/cs42l43-dmic.conf b/ucm2/sof-soundwire/cs42l43-dmic.conf
index d5f895d315a042a7602eb6f21e536ae0b85224e6..b68a70d1249406e0676acee8827710f9051d242a 100644 (file)
--- a/ucm2/sof-soundwire/cs42l43-dmic.conf
+++ b/ucm2/sof-soundwire/cs42l43-dmic.conf
@@ -21,6 +21,6 @@ SectionDevice."Mic" {
                CapturePriority 100
                CapturePCM "hw:${CardId},4"
                CaptureMixer "default:${CardId}"
-               CaptureMixerElem "cs42l43 PDM2"
+               CaptureMixerElem "cs42l43 Microphone"
        }
 }

diff --git a/ucm2/sof-soundwire/cs42l43.conf b/ucm2/sof-soundwire/cs42l43.conf
index 1702cf0d749e707270ed34ccc520dca3d9da270c..ddca67a825e3e23fcb7c5af0ddf7075732690450 100644 (file)
--- a/ucm2/sof-soundwire/cs42l43.conf
+++ b/ucm2/sof-soundwire/cs42l43.conf
@@ -40,7 +40,8 @@ SectionDevice."Headset" {
        Value {
                CapturePriority 200
                CapturePCM "hw:${CardId},4"
-               CaptureMixerElem "cs42l43 Decimator 1"
+               CaptureMixer "default:${CardId}"
+               CaptureMixerElem "cs42l43 Headset Microphone"
                JackControl "Headset Mic Jack"
        }
 }