]> git.alsa-project.org Git - alsa-ucm-conf.git/commit
sof-soundwire: cleanups for codecs with multiple functions
authorJaroslav Kysela <perex@perex.cz>
Thu, 4 Jun 2026 13:26:57 +0000 (15:26 +0200)
committerJaroslav Kysela <perex@perex.cz>
Fri, 12 Jun 2026 11:38:30 +0000 (13:38 +0200)
commitcd342774cd02fd285f1d9e46ac28761158e35397
tree7596d8b35660e1cb8d7e9b25fe5269d76f8d0c84
parentaa528010f1536976d10b2718ae77da2922c7bb0c
sof-soundwire: cleanups for codecs with multiple functions

The load mechanism assumed only one multi-codec in the system, but
we saw in #774 multiple instances of those codecs (rt1320 and rt713).

Make the load mechanism straight:

- introduce file variables
- remove shadow variables
- probe multi-codecs separately and modify the file variables
- test for duplicate file inclusion (in both sof-soundwire / HiFi configs)
- merge dmic configs for rt712,rt713 to one file

This change also improves filters for speaker/headset/mic init includes.

Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/775
Link: https://github.com/alsa-project/alsa-ucm-conf/issues/774
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
14 files changed:
ucm2/codecs/rt1320/init.conf
ucm2/codecs/rt712-dmic/init.conf [deleted file]
ucm2/codecs/rt712/init.conf
ucm2/codecs/rt713-dmic/init.conf [deleted file]
ucm2/codecs/rt713/init.conf
ucm2/sof-soundwire/HiFi.conf
ucm2/sof-soundwire/rt1320.conf
ucm2/sof-soundwire/rt712-dmic.conf [deleted file]
ucm2/sof-soundwire/rt712.conf
ucm2/sof-soundwire/rt713-dmic.conf [deleted file]
ucm2/sof-soundwire/rt713.conf
ucm2/sof-soundwire/rt721.conf
ucm2/sof-soundwire/rt722.conf
ucm2/sof-soundwire/sof-soundwire.conf