diff options
| author | Mark Brown <broonie@kernel.org> | 2023-12-06 16:16:21 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-12-06 16:16:21 +0300 |
| commit | a70af69ce4d0173e30c4ea2a0100d594a90eb54a (patch) | |
| tree | c54058c00a334febba5948a17fbbc139f23b3445 /sound/soc/sof | |
| parent | 615d903ab095b22d70bc8c23ddee475d40f465ca (diff) | |
| parent | ebd12b2ca6145550a7e42cd2320870db02dd0f3c (diff) | |
| download | linux-a70af69ce4d0173e30c4ea2a0100d594a90eb54a.tar.xz | |
ASoC: SOF: topology cleanups
Merge series from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:
Header alignment with firmware, addition of new token and partial
match filters.
Diffstat (limited to 'sound/soc/sof')
| -rw-r--r-- | sound/soc/sof/ipc3-topology.c | 2 | ||||
| -rw-r--r-- | sound/soc/sof/topology.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/sof/ipc3-topology.c b/sound/soc/sof/ipc3-topology.c index 7a4932c152a9..a8e0054cb8a6 100644 --- a/sound/soc/sof/ipc3-topology.c +++ b/sound/soc/sof/ipc3-topology.c @@ -72,6 +72,8 @@ static const struct sof_topology_token buffer_tokens[] = { offsetof(struct sof_ipc_buffer, size)}, {SOF_TKN_BUF_CAPS, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32, offsetof(struct sof_ipc_buffer, caps)}, + {SOF_TKN_BUF_FLAGS, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32, + offsetof(struct sof_ipc_buffer, flags)}, }; /* DAI */ diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index 9f717366cddc..c1f66ba0e987 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -1135,7 +1135,7 @@ static void sof_disconnect_dai_widget(struct snd_soc_component *scomp, list_for_each_entry(rtd, &card->rtd_list, list) { /* does stream match DAI link ? */ if (!rtd->dai_link->stream_name || - strcmp(sname, rtd->dai_link->stream_name)) + !strstr(rtd->dai_link->stream_name, sname)) continue; for_each_rtd_cpu_dais(rtd, i, cpu_dai) |