aboutsummaryrefslogtreecommitdiff
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorLiam Girdwood2018-03-27 14:30:41 +0100
committerMark Brown2018-04-17 18:07:24 +0100
commitf11a5c27f9287cacad74af31cd92d4413eccc05a (patch)
tree7896716d4d960a6aaf952ba2cb4f8f26969cb9e9 /sound/soc/soc-core.c
parent45f8cb57da0d7a9ead4b39d7f5def333a5b0c08b (diff)
ASoC: core: Add name prefix for machines with topology rewrites
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 8f01fe8296ff..aa1c33b3cce0 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2143,6 +2143,14 @@ static void soc_check_tplg_fes(struct snd_soc_card *card)
if (!dai_link->stream_name)
dai_link->stream_name = dai_link->name;
}
+
+ /* Inform userspace we are using alternate topology */
+ if (platform->driver->topology_name_prefix) {
+ snprintf(card->topology_shortname, 32, "%s-%s",
+ platform->driver->topology_name_prefix,
+ card->name);
+ card->name = card->topology_shortname;
+ }
}
}