summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-07-17 00:04:17 +0300
committerMark Brown <broonie@kernel.org>2015-07-17 00:04:17 +0300
commit904e8b0b3074a570b6e714fbc3db72441f313638 (patch)
tree5ab392009a7ac66b928f073843b17d353223cb03 /include
parent7b47ab47b3938e2274834dbde7915df98fc74368 (diff)
parent5e3cdaa20816dd2fe4dc17d06a9f0dae0abc930c (diff)
downloadlinux-904e8b0b3074a570b6e714fbc3db72441f313638.tar.xz
Merge branch 'topic/of-name' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rcar
Diffstat (limited to 'include')
-rw-r--r--include/sound/soc.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 93df8bf9d54a..75cd19ced804 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1604,6 +1604,10 @@ int snd_soc_of_parse_audio_simple_widgets(struct snd_soc_card *card,
int snd_soc_of_parse_tdm_slot(struct device_node *np,
unsigned int *slots,
unsigned int *slot_width);
+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);
int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
const char *propname);
unsigned int snd_soc_of_parse_daifmt(struct device_node *np,