From: han.lu@intel.com
To: broonie@kernel.org, tiwai@suse.de, vinod.koul@intel.com,
pierre-louis.bossart@linux.intel.com,
liam.r.girdwood@linux.intel.com, alsa-devel@alsa-project.org
Cc: "Lu, Han" <han.lu@intel.com>
Subject: [PATCH V3 1/2] ASoC: core: add API for registering DMI card names
Date: Thu, 31 Mar 2016 16:58:03 +0800 [thread overview]
Message-ID: <79fd64c59dd44d44e018245ad411d48f5ba01b24.1459414492.git.han.lu@intel.com> (raw)
In-Reply-To: <cover.1459414492.git.han.lu@intel.com>
In-Reply-To: <cover.1459414492.git.han.lu@intel.com>
From: "Lu, Han" <han.lu@intel.com>
Add core API for registering DMI card names, so user space utils such
as PA and UCM can distinguish various products.
Previously on ASoC, the card short name, driver name and long name are
all the same as the machine driver name.
The patch adds more board information:
card driver name ---> machine driver name
card short name ---> DMI_BOARD_NAME or DMI_PRODUCT_NAME
card long name and
card component ---> short name:driver name:(DMI_SYS_VENDOR if
available):(the firmware name if available)
Signed-off-by: Lu, Han <han.lu@intel.com>
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 02b4a21..4e80444 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -486,6 +486,9 @@ void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream);
int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
unsigned int dai_fmt);
+int snd_soc_set_card_names(struct snd_soc_card *card, const char *board,
+ const char *vendor, const char *firmware);
+
/* Utility functions to get clock rates from various things */
int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots);
int snd_soc_params_to_frame_size(struct snd_pcm_hw_params *params);
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index d2e62b15..8f9c13f 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1828,6 +1828,59 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
}
EXPORT_SYMBOL_GPL(snd_soc_runtime_set_dai_fmt);
+/**
+ * snd_soc_set_card_names() - Set the shortname/drivername/longname/component
+ * of a ASoC card.
+ * @card: The card to set names
+ * @board: DMI_BOARD_NAME or DMI_PRODUCT_NAME
+ * @vendor: DMI_SYS_VENDOR
+ * @firmware: The firmware name
+ *
+ * This function registers DMI names to card for the userspace to distinguish
+ * different boards/products:
+ * card driver name ---> machine driver name
+ * card short name ---> DMI_BOARD_NAME or DMI_PRODUCT_NAME
+ * card long name and
+ * card component ---> short name:driver name:(DMI_SYS_VENDOR)
+ * :(firmware name)
+ *
+ * Returns 0 on success, otherwise a negative error code.
+ */
+int snd_soc_set_card_names(struct snd_soc_card *card, const char *board,
+ const char *vendor, const char *firmware)
+{
+ int ret = 0;
+ size_t buf_size, name_size;
+ char *name;
+
+ if (!board) {
+ dev_err(card->dev, "ASoC: the board/product name is empty!\n");
+ return -EINVAL;
+ }
+
+ /* card driver name */
+ card->driver_name = card->name;
+ /* card short name */
+ card->name = board;
+ /* card long name / card component */
+ buf_size = sizeof(card->snd_card->longname);
+ name_size = strlen(card->name) + strlen(card->driver_name)
+ + strlen(vendor) + strlen(firmware) + 4;
+ if (buf_size < name_size + strlen(card->snd_card->components))
+ return -ENOMEM;
+ name = kmalloc(buf_size, GFP_KERNEL);
+ if (!name)
+ return -ENOMEM;
+ snprintf(name, buf_size, "%s:%s:%s:%s", card->name,
+ card->driver_name, vendor, firmware);
+ ret = snd_component_add(card->snd_card, name);
+ card->long_name = card->snd_card->components;
+
+ kfree(name);
+ return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_set_card_names);
+
static int snd_soc_instantiate_card(struct snd_soc_card *card)
{
struct snd_soc_codec *codec;
--
2.5.0
next prev parent reply other threads:[~2016-03-31 8:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-31 8:58 [PATCH V3 0/2] ASoC: share more product information with user space han.lu
2016-03-31 8:58 ` han.lu [this message]
2016-03-31 12:00 ` [PATCH V3 1/2] ASoC: core: add API for registering DMI card names Lars-Peter Clausen
2016-03-31 14:48 ` Lu, Han
2016-03-31 8:58 ` [PATCH V3 2/2] ASoC: bytcr-rt5640: register DMI names to card han.lu
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=79fd64c59dd44d44e018245ad411d48f5ba01b24.1459414492.git.han.lu@intel.com \
--to=han.lu@intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=liam.r.girdwood@linux.intel.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=tiwai@suse.de \
--cc=vinod.koul@intel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.