summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-07-16 22:04:17 +0100
committerMark Brown <broonie@kernel.org>2015-07-16 22:04:17 +0100
commit904e8b0b3074a570b6e714fbc3db72441f313638 (patch)
tree5ab392009a7ac66b928f073843b17d353223cb03 /sound
parent7b47ab47b3938e2274834dbde7915df98fc74368 (diff)
parent5e3cdaa20816dd2fe4dc17d06a9f0dae0abc930c (diff)
downloadlwn-904e8b0b3074a570b6e714fbc3db72441f313638.tar.gz
lwn-904e8b0b3074a570b6e714fbc3db72441f313638.zip
Merge branch 'topic/of-name' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rcar
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-core.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 3a4a5c0e3f97..fd15d5418647 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3303,6 +3303,26 @@ int snd_soc_of_parse_tdm_slot(struct device_node *np,
}
EXPORT_SYMBOL_GPL(snd_soc_of_parse_tdm_slot);
+void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card,
+ struct snd_soc_codec_conf *codec_conf,
+ struct device_node *of_node,
+ const char *propname)
+{
+ struct device_node *np = card->dev->of_node;
+ const char *str;
+ int ret;
+
+ ret = of_property_read_string(np, propname, &str);
+ if (ret < 0) {
+ /* no prefix is not error */
+ return;
+ }
+
+ codec_conf->of_node = of_node;
+ codec_conf->name_prefix = str;
+}
+EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_prefix);
+
int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
const char *propname)
{