- Alsa-devel - mailman.alsa-project.org

[PATCH alsa-ucm-conf v1] sof-soundwire: Add LED support for cs35l56 amplifiers
by Stefan Binding 31 Mar '25

31 Mar '25

Systems may have up to 8 CS35L56 amplifiers, and each amplifier should be attached to the speaker LED. A mapped Playback switch is required to ensure all amps are muted and unmute appropriately. Signed-off-by: Stefan Binding <sbinding(a)opensource.cirrus.com> --- ucm2/codecs/cs35l56-bridge/init.conf | 11 ++++++++ ucm2/codecs/cs35l56/init.conf | 36 +++++++++++++++++++++++++++ ucm2/sof-soundwire/cs35l56.conf | 32 ++---------------------- ucm2/sof-soundwire/sof-soundwire.conf | 4 +-- 4 files changed, 51 insertions(+), 32 deletions(-) create mode 100644 ucm2/codecs/cs35l56-bridge/init.conf create mode 100644 ucm2/codecs/cs35l56/init.conf diff --git a/ucm2/codecs/cs35l56-bridge/init.conf b/ucm2/codecs/cs35l56-bridge/init.conf new file mode 100644 index 000000000000..407bb0937559 --- /dev/null +++ b/ucm2/codecs/cs35l56-bridge/init.conf @@ -0,0 +1,11 @@ +# cs35l56 specific control settings + +FixedBootSequence [ + cset "name='AMPL Speaker Switch' 0" + cset "name='AMPR Speaker Switch' 0" +] + +Macro [ + { SetLED { LED="speaker" Action="attach" CtlId="AMPL Speaker Switch" } } + { SetLED { LED="speaker" Action="attach" CtlId="AMPR Speaker Switch" } } +] \ No newline at end of file diff --git a/ucm2/codecs/cs35l56/init.conf b/ucm2/codecs/cs35l56/init.conf new file mode 100644 index 000000000000..dca14c709fda --- /dev/null +++ b/ucm2/codecs/cs35l56/init.conf @@ -0,0 +1,36 @@ +# cs35l56 specific control settings + +# +# Arguments: +# ForAmps - regex filter for var:SpeakerAmps +# Amp - amplifier number 1-8 +# +DefineMacro.cs35l56spkInit.If.0 { + Condition { + Type RegexMatch + Regex "${var:__ForAmps}" + String "${var:SpeakerAmps}" + } + True { + LibraryConfig.remap.Config.ctl.default.map { + "name='cs35l56 Speaker Playback Switch'" { + "name='AMP${var:__Amp} Speaker Switch'".vindex."${eval:($__Amp-1)}" 0 + } + } + FixedBootSequence [ + cset "name='AMP${var:__Amp} Speaker Switch' 0" + ] + Macro [{ SetLED { LED="speaker" Action="attach" CtlId="AMP${var:__Amp} Speaker Switch" } }] + } +} + +Macro [ + { cs35l56spkInit { ForAmps "[1-8]" Amp 1 } } + { cs35l56spkInit { ForAmps "[2-8]" Amp 2 } } + { cs35l56spkInit { ForAmps "[3-8]" Amp 3 } } + { cs35l56spkInit { ForAmps "[4-8]" Amp 4 } } + { cs35l56spkInit { ForAmps "[5-8]" Amp 5 } } + { cs35l56spkInit { ForAmps "[6-8]" Amp 6 } } + { cs35l56spkInit { ForAmps "[78]" Amp 7 } } + { cs35l56spkInit { ForAmps "8" Amp 8 } } +] diff --git a/ucm2/sof-soundwire/cs35l56.conf b/ucm2/sof-soundwire/cs35l56.conf index f74b99afbb55..53e4d6dd8eda 100644 --- a/ucm2/sof-soundwire/cs35l56.conf +++ b/ucm2/sof-soundwire/cs35l56.conf @@ -1,40 +1,12 @@ # Use case Configuration for sof-soundwire card -# -# Arguments: -# ForAmps - regex filter for var:SpeakerAmps -# Amp - amplifier number 1-8 -# -DefineMacro.cs42l43spk.If.0 { - Condition { - Type RegexMatch - Regex "${var:__ForAmps}" - String "${var:SpeakerAmps}" - } - True { - EnableSequence [ - cset "name='AMP${var:__Amp} Speaker Switch' 1" - ] - DisableSequence [ - cset "name='AMP${var:__Amp} Speaker Switch' 0" - ] - } -} - SectionDevice."Speaker" { Comment "Speaker" - Macro.num1.cs42l43spk { ForAmps "[1-8]" Amp 1 } - Macro.num2.cs42l43spk { ForAmps "[2-8]" Amp 2 } - Macro.num3.cs42l43spk { ForAmps "[3-8]" Amp 3 } - Macro.num4.cs42l43spk { ForAmps "[4-8]" Amp 4 } - Macro.num5.cs42l43spk { ForAmps "[5-8]" Amp 5 } - Macro.num6.cs42l43spk { ForAmps "[6-8]" Amp 6 } - Macro.num7.cs42l43spk { ForAmps "[78]" Amp 7 } - Macro.num8.cs42l43spk { ForAmps "8" Amp 8 } - Value { PlaybackPriority 100 PlaybackPCM "hw:${CardId},2" + PlaybackMixer "default:${CardId}" + PlaybackMixerElem "cs35l56 Speaker" } } diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf index 1cddfbf4cfbf..8f9bc82c2d3b 100644 --- a/ucm2/sof-soundwire/sof-soundwire.conf +++ b/ucm2/sof-soundwire/sof-soundwire.conf @@ -102,10 +102,10 @@ If.multi_headset { } } -If.spk_init_rt1318 { +If.spk_init { Condition { Type RegexMatch - Regex "(rt1318(-1)?)" + Regex "(rt1318(-1)?|cs35l56(-bridge)?)" String "${var:SpeakerCodec1}" } True.Include.spk_init.File "/codecs/${var:SpeakerCodec1}/init.conf" -- 2.43.0

2 1

USB-Audio: Add focusrite scarlett 18i20 lineup
by GitHub pull_request - opened 30 Mar '25

30 Mar '25

alsa-project/alsa-ucm-conf pull request #539 was opened from ScarletRav3n: Other solutions exist to add full mixing and routing with these devices. This PR adds basic functionality in an out-of-the-box style for 1st gen, 2nd gen, 3rd gen, and 4th gen. IO includes XLR, Line, S/PDIF, ADAT, and Headphone ports. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/539 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/539.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

USB-Audio: Add Focusrite Scarlett 18i20 Lineup
by GitHub pull_request - edited 30 Mar '25

30 Mar '25

alsa-project/alsa-ucm-conf pull request #538 was edited from ScarletRav3n: Other solutions exist to add full mixing and routing with these devices. This PR adds basic functionality in an out-of-the-box style for 1st gen, 2nd gen, 3rd gen, and 4th gen. I/O includes all XLR, Line, S/PDIF, ADAT, and Headphone ports. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/538 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/538.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

USB-Audio: Add Focusrite Scarlett 18i20 Lineup
by GitHub pull_request - opened 30 Mar '25

30 Mar '25

alsa-project/alsa-ucm-conf pull request #538 was opened from ScarletRav3n: Other solutions exist to add full mixing and routing with these devices. This PR adds basic functionality in an out-of-the-box style for 2nd gen, 3rd gen, and 4th gen. 1st gen is not supported with this iteration of PR. I/O includes all XLR, Line, S/PDIF, ADAT, and Headphone ports. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/538 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/538.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

envy24control: fix memory access errors in profiles
by GitHub pull_request - opened 29 Mar '25

29 Mar '25

alsa-project/alsa-tools pull request #34 was opened from andreas56: Fix two memory errors in the profiles parser: an invalid read and a "source and destination overlap in strncpy" warning. When the profiles page is initialized it fetches the profile names from the profiles file. When a profile wasn't defined in the file, the parser made invalid reads outside the buffer. Request URL : https://github.com/alsa-project/alsa-tools/pull/34 Patch URL : https://github.com/alsa-project/alsa-tools/pull/34.patch Repository URL: https://github.com/alsa-project/alsa-tools

1 0

envy24control: fix file descriptor leaks in profiles
by GitHub pull_request - opened 29 Mar '25

29 Mar '25

alsa-project/alsa-tools pull request #33 was opened from andreas56: File descriptors were leaked when "Save active profile" was pressed. Add the missing calls to close. Request URL : https://github.com/alsa-project/alsa-tools/pull/33 Patch URL : https://github.com/alsa-project/alsa-tools/pull/33.patch Repository URL: https://github.com/alsa-project/alsa-tools

1 0

envy24control: fix crash when using system profiles file
by GitHub pull_request - opened 29 Mar '25

29 Mar '25

alsa-project/alsa-tools pull request #32 was opened from andreas56: envy24control crashed if you tried to start it with -f /etc/envy24control/profiles.conf. Request URL : https://github.com/alsa-project/alsa-tools/pull/32 Patch URL : https://github.com/alsa-project/alsa-tools/pull/32.patch Repository URL: https://github.com/alsa-project/alsa-tools

1 0

envy24control: fix GtkSpinButton runtime warnings
by GitHub pull_request - opened 29 Mar '25

29 Mar '25

alsa-project/alsa-tools pull request #31 was opened from andreas56: Change the parameters to gtk_adjustment_new to get rid of this runtime warning from GTK: GtkSpinButton: setting an adjustment with non-zero page size is deprecated The change is also important when envy24control is ported to GTK 3, as the spin buttons will stop working if it's not done. Request URL : https://github.com/alsa-project/alsa-tools/pull/31 Patch URL : https://github.com/alsa-project/alsa-tools/pull/31.patch Repository URL: https://github.com/alsa-project/alsa-tools

1 0

envy24control: fix control callback for spdif output
by GitHub pull_request - opened 29 Mar '25

29 Mar '25

alsa-project/alsa-tools pull request #30 was opened from andreas56: Update S/PDIF Output Settings GUI when settings change. Request URL : https://github.com/alsa-project/alsa-tools/pull/30 Patch URL : https://github.com/alsa-project/alsa-tools/pull/30.patch Repository URL: https://github.com/alsa-project/alsa-tools

1 0

[PATCH alsa-ucm-conf v2 1/2] sof-soundwire: cs42l43: Drop headset mic from mic mute LED
by Maciej Strozek 28 Mar '25

28 Mar '25

As per conversation in [1], let headsets be dropped from LED bindings. [1]: https://github.com/alsa-project/alsa-ucm-conf/pull/512 Signed-off-by: Maciej Strozek <mstrozek(a)opensource.cirrus.com> --- v2: Added DisableSequences back --- ucm2/codecs/cs42l43/init.conf | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ucm2/codecs/cs42l43/init.conf b/ucm2/codecs/cs42l43/init.conf index 0e987c21..c0fa863c 100644 --- a/ucm2/codecs/cs42l43/init.conf +++ b/ucm2/codecs/cs42l43/init.conf @@ -10,9 +10,3 @@ LibraryConfig.remap.Config { } } } - -BootSequence [ - cset "name='cs42l43 Decimator 1 Switch' 0" -] - -Macro [{ SetLED { LED="mic" Action="attach" CtlId="cs42l43 Decimator 1 Switch" } }] -- 2.39.5

1 1