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>

diff --git a/Documentation/devicetree/bindings/sound/simple-scu-card.txt b/Documentation/devicetree/bindings/sound/simple-scu-card.txt
index 327d229a51b27e126fad58678a75dd2c803fed54..32f8dbce5241d4a9ad612c7c47e0890fc3438625 100644 (file)
--- 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:
 - simple-audio-card,convert-rate       : platform specified sampling rate convert
 - simple-audio-card,convert-channels   : platform specified converted channel size (2 - 8 ch)
 - simple-audio-card,prefix             : see routing
+- simple-audio-card,widgets            : Please refer to widgets.txt.
 - simple-audio-card,routing            : A list of the connections between audio components.
                                          Each entry is a pair of strings, the first being the connection's sink,
                                          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 a75b385455c4f62c0f473baea203f94b9c990a8b..0bb3da755532a59f27f4d92eb8b9449bb2d82fcb 100644 (file)
--- 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)
        if (!node)
                return -EINVAL;
 
+       ret = asoc_simple_card_of_parse_widgets(card, PREFIX);
+       if (ret < 0)
+               return ret;
+
        ret = asoc_simple_card_of_parse_routing(card, PREFIX, 0);
        if (ret < 0)
                return ret;