From: Liam Girdwood <liam.r.girdwood@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: Liam Girdwood <liam.r.girdwood@linux.intel.com>,
Mark Brown <broonie@kernel.org>
Subject: [PATCH] ASoC: core: Add name prefix for machines with different topologies
Date: Wed, 14 Mar 2018 20:25:11 +0000 [thread overview]
Message-ID: <20180314202511.13614-1-liam.r.girdwood@linux.intel.com> (raw)
Provide a mechanism for drivers to modify there card name with a prefix
so that userspace can load a different configuration file to default.
This can be useful when topology has changed the PCMs and kcontrols
for a machine.
This will be used by SOF to differentiate sound card names for UCM etc.
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
---
include/sound/soc.h | 2 ++
sound/soc/soc-core.c | 8 ++++++++
2 files changed, 10 insertions(+)
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 4e368c308f93..99b77feab364 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -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;
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 33840e5bc24e..4ab2b4ac8522 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2144,6 +2144,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;
+ }
}
}
--
2.14.1
next reply other threads:[~2018-03-14 20:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-14 20:25 Liam Girdwood [this message]
2018-03-19 7:13 ` [PATCH] ASoC: core: Add name prefix for machines with different topologies Mark Brown
2018-04-17 17:09 ` Applied "ASoC: core: Add name prefix for machines with topology rewrites" to the asoc tree Mark Brown
2018-04-17 17:11 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180314202511.13614-1-liam.r.girdwood@linux.intel.com \
--to=liam.r.girdwood@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).