aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baluta <daniel.baluta@nxp.com>2017-08-11 10:12:19 -0400
committerMark Brown <broonie@kernel.org>2017-08-16 07:00:18 -0400
commitd0148eb4a41e65ac95bfaaa13c75364b95b1e052 (patch)
tree43a5a1dd62ec8f7d37200b887aa2bf2b9548579f
parent5771a8c08880cdca3bfb4a3fc6d309d6bba20877 (diff)
ASoC: simple-scu-card: Parse off codec widgets
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--Documentation/devicetree/bindings/sound/simple-scu-card.txt1
-rw-r--r--sound/soc/generic/simple-scu-card.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/sound/simple-scu-card.txt b/Documentation/devicetree/bindings/sound/simple-scu-card.txt
index 327d229a51b2..32f8dbce5241 100644
--- a/Documentation/devicetree/bindings/sound/simple-scu-card.txt
+++ b/Documentation/devicetree/bindings/sound/simple-scu-card.txt
@@ -24,6 +24,7 @@ Optional subnode properties:
24- simple-audio-card,convert-rate : platform specified sampling rate convert 24- simple-audio-card,convert-rate : platform specified sampling rate convert
25- simple-audio-card,convert-channels : platform specified converted channel size (2 - 8 ch) 25- simple-audio-card,convert-channels : platform specified converted channel size (2 - 8 ch)
26- simple-audio-card,prefix : see routing 26- simple-audio-card,prefix : see routing
27- simple-audio-card,widgets : Please refer to widgets.txt.
27- simple-audio-card,routing : A list of the connections between audio components. 28- simple-audio-card,routing : A list of the connections between audio components.
28 Each entry is a pair of strings, the first being the connection's sink, 29 Each entry is a pair of strings, the first being the connection's sink,
29 the second being the connection's source. Valid names for sources. 30 the second being the connection's source. Valid names for sources.
diff --git a/sound/soc/generic/simple-scu-card.c b/sound/soc/generic/simple-scu-card.c
index a75b385455c4..0bb3da755532 100644
--- a/sound/soc/generic/simple-scu-card.c
+++ b/sound/soc/generic/simple-scu-card.c
@@ -191,6 +191,10 @@ static int asoc_simple_card_parse_of(struct simple_card_data *priv)
191 if (!node) 191 if (!node)
192 return -EINVAL; 192 return -EINVAL;
193 193
194 ret = asoc_simple_card_of_parse_widgets(card, PREFIX);
195 if (ret < 0)
196 return ret;
197
194 ret = asoc_simple_card_of_parse_routing(card, PREFIX, 0); 198 ret = asoc_simple_card_of_parse_routing(card, PREFIX, 0);
195 if (ret < 0) 199 if (ret < 0)
196 return ret; 200 return ret;