ucm2: sof-soundwire: Add support for CS42L43B variant

From UCM point of view CS42L43B codec adds 2 new decimators and removes
a control to change Decimator 1 mode from base CS42L43. Thus reuse
CS42L43 files, and guard the CS42L43B additions behind a condition
that the new Decimator controls exist.

Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/665
Link: https://lore.kernel.org/all/20260306152829.3130530-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-dmic/init.conf b/ucm2/codecs/cs42l43-dmic/init.conf
index e8df2c156558546893adfafb13ee53dcd952f824..ea91fa4647eed7d127b592d8573147e20da315f5 100644 (file)
--- a/ucm2/codecs/cs42l43-dmic/init.conf
+++ b/ucm2/codecs/cs42l43-dmic/init.conf
@@ -1,18 +1,5 @@
 # cs42l43 specific control settings
 
-LibraryConfig.remap.Config {
-       ctl.default.map {
-               "name='cs42l43 Microphone Capture Switch'" {
-                       "name='cs42l43 Decimator 3 Switch'".vindex.0 0
-                       "name='cs42l43 Decimator 4 Switch'".vindex.1 0
-               }
-               "name='cs42l43 Microphone Capture Volume'" {
-                       "name='cs42l43 Decimator 3 Volume'".vindex.0 0
-                       "name='cs42l43 Decimator 4 Volume'".vindex.1 0
-               }
-       }
-}
-
 BootSequence [
        cset "name='cs42l43 Decimator 3 Switch' 0"
        cset "name='cs42l43 Decimator 4 Switch' 0"
@@ -22,3 +9,52 @@ Macro [
        { SetLED { LED="mic" Action="attach" CtlId="cs42l43 Decimator 3 Switch" } }
        { SetLED { LED="mic" Action="attach" CtlId="cs42l43 Decimator 4 Switch" } }
 ]
+
+If.CS42L43B {
+       Condition {
+               Type ControlExists
+               Control "name='cs42l43 Decimator 5 Switch'"
+       }
+       True {
+               LibraryConfig.remap.Config {
+                       ctl.default.map {
+                               "name='cs42l43 Microphone Capture Switch'" {
+                                       "name='cs42l43 Decimator 5 Switch'".vindex.0 0
+                                       "name='cs42l43 Decimator 6 Switch'".vindex.1 0
+                                       "name='cs42l43 Decimator 3 Switch'".vindex.2 0
+                                       "name='cs42l43 Decimator 4 Switch'".vindex.3 0
+                               }
+                               "name='cs42l43 Microphone Capture Volume'" {
+                                       "name='cs42l43 Decimator 5 Volume'".vindex.0 0
+                                       "name='cs42l43 Decimator 6 Volume'".vindex.1 0
+                                       "name='cs42l43 Decimator 3 Volume'".vindex.2 0
+                                       "name='cs42l43 Decimator 4 Volume'".vindex.3 0
+                               }
+                       }
+               }
+
+               BootSequence [
+                       cset "name='cs42l43 Decimator 5 Switch' 0"
+                       cset "name='cs42l43 Decimator 6 Switch' 0"
+               ]
+
+               Macro [
+                       { SetLED { LED="mic" Action="attach" CtlId="cs42l43 Decimator 5 Switch" } }
+                       { SetLED { LED="mic" Action="attach" CtlId="cs42l43 Decimator 6 Switch" } }
+               ]
+       }
+       False {
+               LibraryConfig.remap.Config {
+                       ctl.default.map {
+                               "name='cs42l43 Microphone Capture Switch'" {
+                                       "name='cs42l43 Decimator 3 Switch'".vindex.0 0
+                                       "name='cs42l43 Decimator 4 Switch'".vindex.1 0
+                               }
+                               "name='cs42l43 Microphone Capture Volume'" {
+                                       "name='cs42l43 Decimator 3 Volume'".vindex.0 0
+                                       "name='cs42l43 Decimator 4 Volume'".vindex.1 0
+                               }
+                       }
+               }
+       }
+}

diff --git a/ucm2/sof-soundwire/cs42l43-dmic.conf b/ucm2/sof-soundwire/cs42l43-dmic.conf
index b68a70d1249406e0676acee8827710f9051d242a..c0b622cddfe193c8a4716762fcdd45eaab6b1fc2 100644 (file)
--- a/ucm2/sof-soundwire/cs42l43-dmic.conf
+++ b/ucm2/sof-soundwire/cs42l43-dmic.conf
@@ -7,16 +7,37 @@ SectionDevice."Mic" {
                "Headset"
        ]
 
-       EnableSequence [
-               cset "name='cs42l43 DP1TX1 Input' 'Decimator 3'"
-               cset "name='cs42l43 DP1TX2 Input' 'Decimator 4'"
-       ]
-
        DisableSequence [
                cset "name='cs42l43 DP1TX1 Input' 'None'"
                cset "name='cs42l43 DP1TX2 Input' 'None'"
        ]
 
+       If.CS42L43B {
+               Condition {
+                       Type ControlExists
+                       Control "name='cs42l43 Decimator 5 Switch'"
+               }
+               True {
+                       EnableSequence [
+                               cset "name='cs42l43 DP1TX1 Input' 'Decimator 5'"
+                               cset "name='cs42l43 DP1TX2 Input' 'Decimator 6'"
+                               cset "name='cs42l43 DP1TX3 Input' 'Decimator 3'"
+                               cset "name='cs42l43 DP1TX4 Input' 'Decimator 4'"
+                       ]
+
+                       DisableSequence [
+                               cset "name='cs42l43 DP1TX3 Input' 'None'"
+                               cset "name='cs42l43 DP1TX4 Input' 'None'"
+                       ]
+               }
+               False {
+                       EnableSequence [
+                               cset "name='cs42l43 DP1TX1 Input' 'Decimator 3'"
+                               cset "name='cs42l43 DP1TX2 Input' 'Decimator 4'"
+                       ]
+               }
+       }
+
        Value {
                CapturePriority 100
                CapturePCM "hw:${CardId},4"

diff --git a/ucm2/sof-soundwire/cs42l43.conf b/ucm2/sof-soundwire/cs42l43.conf
index 518321263406891f7f9d6077351a810e0309e0ef..b9e7b300800e677e7fb0fa84bc6e6760f2a2f052 100644 (file)
--- a/ucm2/sof-soundwire/cs42l43.conf
+++ b/ucm2/sof-soundwire/cs42l43.conf
@@ -26,11 +26,21 @@ SectionDevice."Headset" {
 
        EnableSequence [
                cset "name='cs42l43 ADC1 Input' 'IN1'"
-               cset "name='cs42l43 Decimator 1 Mode' 'ADC'"
 
                cset "name='cs42l43 DP2TX1 Input' 'Decimator 1'"
                cset "name='cs42l43 DP2TX2 Input' 'Decimator 1'"
        ]
+       If.CS42L43B {
+               Condition {
+                       Type ControlExists
+                       Control "name='cs42l43 Decimator 5 Switch'"
+               }
+               False {
+                       EnableSequence [
+                               cset "name='cs42l43 Decimator 1 Mode' 'ADC'"
+                       ]
+               }
+       }
 
        DisableSequence [
                cset "name='cs42l43 DP2TX1 Input' 'None'"