diff options
| author |   Daniel Baluta <daniel.baluta@nxp.com> | 2017-08-11 17:12:19 +0300 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2017-08-16 12:00:18 +0100 |
| commit | d0148eb4a41e65ac95bfaaa13c75364b95b1e052 (patch) | |
| tree | 43a5a1dd62ec8f7d37200b887aa2bf2b9548579f | |
| parent | Linux v4.13-rc1 (diff) | |
| download | linux-dev-d0148eb4a41e65ac95bfaaa13c75364b95b1e052.tar.xz linux-dev-d0148eb4a41e65ac95bfaaa13c75364b95b1e052.zip | |
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.txt | 1 | ||||
| -rw-r--r-- | sound/soc/generic/simple-scu-card.c | 4 |
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: - 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 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) 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; |