diff options
| author | Liam Girdwood | 2018-03-27 15:30:41 +0200 |
|---|---|---|
| committer | Mark Brown | 2018-04-17 19:07:24 +0200 |
| commit | f11a5c27f9287cacad74af31cd92d4413eccc05a (patch) | |
| tree | 7896716d4d960a6aaf952ba2cb4f8f26969cb9e9 /sound/soc | |
| parent | ASoC: core: Allow topology to override machine driver FE DAI link config. (diff) | |
| download | kernel-qcow2-linux-f11a5c27f9287cacad74af31cd92d4413eccc05a.tar.gz kernel-qcow2-linux-f11a5c27f9287cacad74af31cd92d4413eccc05a.tar.xz kernel-qcow2-linux-f11a5c27f9287cacad74af31cd92d4413eccc05a.zip | |
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')
| -rw-r--r-- | sound/soc/soc-core.c | 8 |
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; + } } } |