summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiubo Li <Li.Xiubo@freescale.com>2014-02-08 08:59:53 +0100
committerMark Brown <broonie@linaro.org>2014-02-10 14:33:40 +0100
commit9d681f5bfc85515a7b4a4af09337ed5e74f39ad9 (patch)
tree4ea055271e486d2a5a452baba60cc1009c3bf7b2
parentMerge branch 'topic/of' of git://git.kernel.org/pub/scm/linux/kernel/git/broo... (diff)
downloadlinux-9d681f5bfc85515a7b4a4af09337ed5e74f39ad9.tar.xz
linux-9d681f5bfc85515a7b4a4af09337ed5e74f39ad9.zip
ASoC: simple-card: add off-codec widgets supports.
Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/generic/simple-card.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 0890fcdc9251..4fe8abc6e216 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -150,6 +150,14 @@ static int asoc_simple_card_parse_of(struct device_node *node,
priv->daifmt = snd_soc_of_parse_daifmt(node, "simple-audio-card,") &
(SND_SOC_DAIFMT_FORMAT_MASK | SND_SOC_DAIFMT_INV_MASK);
+ /* off-codec widgets */
+ if (of_property_read_bool(node, "simple-audio-card,widgets")) {
+ ret = snd_soc_of_parse_audio_simple_widgets(&priv->snd_card,
+ "simple-audio-card,widgets");
+ if (ret)
+ return ret;
+ }
+
/* DAPM routes */
if (of_property_read_bool(node, "simple-audio-card,routing")) {
ret = snd_soc_of_parse_audio_routing(&priv->snd_card,