alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v4 1/3] ASoC: Add utility to set a card's name from device tree
@ 2011-12-12 22:55 Stephen Warren
       [not found] ` <1323730536-19915-1-git-send-email-swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
  0 siblings, 1 reply; 4+ messages in thread
From: Stephen Warren @ 2011-12-12 22:55 UTC (permalink / raw)
  To: Mark Brown, Liam Girdwood
  Cc: alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw,
	linux-tegra-u79uwXL29TY76Z2rM5mHXA, Stephen Warren

Implement snd_soc_of_parse_card_name(), a utility function that sets a
card's name from device tree. The machine driver specifies the DT
property to use, since this is binding-specific.

Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
This series is based on my previously posted patch "ASoC: Allow DAI
links to be specified using device tree nodes" v4. Patches 1 & 2 at
most rely on that for context. Patch 3 relies on it for functionality.

v2: New patch implementing new functionality
v3: Name this embedded-audio-complex instead of soc-audio-complex.
    Change property name from user-visible-name to model.
    Remove compatible property from binding.
v4: Convert this to a utility function that cards can call if desired.
    Modify snd_soc_register_card() not to call this automatically.
    Allow cards to specify the name of the device tree property that
    stores that card's name. Don't specify the property as a generic
    binding; remove embedded-audio-complex.txt

 include/sound/soc.h  |    3 +++
 sound/soc/soc-core.c |   25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 40c256e..6e51a3f 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -966,6 +966,9 @@ static inline bool snd_soc_volsw_is_stereo(struct soc_mixer_control *mc)
 int snd_soc_util_init(void);
 void snd_soc_util_exit(void);
 
+int snd_soc_of_parse_card_name(struct snd_soc_card *card,
+			       const char *propname);
+
 #include <sound/soc-dai.h>
 
 #ifdef CONFIG_DEBUG_FS
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 83aa82e..4e8d762 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -32,6 +32,7 @@
 #include <linux/platform_device.h>
 #include <linux/ctype.h>
 #include <linux/slab.h>
+#include <linux/of.h>
 #include <sound/ac97_codec.h>
 #include <sound/core.h>
 #include <sound/jack.h>
@@ -3367,6 +3368,30 @@ found:
 }
 EXPORT_SYMBOL_GPL(snd_soc_unregister_codec);
 
+/* Retrieve a card's name from device tree */
+int snd_soc_of_parse_card_name(struct snd_soc_card *card,
+			       const char *propname)
+{
+	struct device_node *np = card->dev->of_node;
+	int ret;
+
+	ret = of_property_read_string_index(np, propname, 0, &card->name);
+	/*
+	 * EINVAL means the property does not exist. This is fine providing
+	 * card->name was previously set, which is checked later in
+	 * snd_soc_register_card.
+	 */
+	if (ret < 0 && ret != -EINVAL) {
+		dev_err(card->dev,
+			"Property '%s' could not be read: %d\n",
+			propname, ret);
+		return ret;
+	}
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(snd_soc_of_parse_card_name);
+
 static int __init snd_soc_init(void)
 {
 #ifdef CONFIG_DEBUG_FS
-- 
1.7.0.4

^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-12-20  1:05 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-12 22:55 [PATCH v4 1/3] ASoC: Add utility to set a card's name from device tree Stephen Warren
     [not found] ` <1323730536-19915-1-git-send-email-swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2011-12-12 22:55   ` [PATCH v4 2/3] ASoC: Add utility to parse DAPM routes " Stephen Warren
2011-12-12 22:55   ` [PATCH v4 3/3] ASoC: Tegra+WM8903 machine: Add device tree binding Stephen Warren
2011-12-20  1:05   ` [PATCH v4 1/3] ASoC: Add utility to set a card's name from device tree Mark Brown

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).