leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: core: Add name prefix for machines with topology rewrites

Browse Source 
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Liam Girdwood 2018-03-27 14:30:41 +01:00 committed by Mark Brown
parent 45f8cb57da
commit f11a5c27f9
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sound/soc.h
View File

@ -1015,6 +1015,7 @@ struct snd_soc_platform_driver {
/* this platform uses topology and ignore machine driver FEs */
const char *ignore_machine;
const char *topology_name_prefix;
int (*be_hw_params_fixup)(struct snd_soc_pcm_runtime *rtd,
struct snd_pcm_hw_params *params);
bool use_dai_pcm_id; /* use the DAI link PCM ID as PCM device number */
@ -1167,6 +1168,7 @@ struct snd_soc_card {
const char *long_name;
const char *driver_name;
char dmi_longname[80];
char topology_shortname[32];
struct device *dev;
struct snd_card *snd_card;

8
sound/soc/soc-core.c
View File

@ -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;
}
}
}