diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-10 17:09:21 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-10 17:09:21 +0200 |
| commit | 1ddca24c532247894eb4430e9315e690306cf860 (patch) | |
| tree | e0021306bdc42615ba304b0ac4dd3db6b73cae55 /sound/soc/fsl/fsl-asoc-card.c | |
| parent | Merge branch 'topic/delay' of git://git.kernel.org/pub/scm/linux/kernel/git/b... (diff) | |
| parent | ASoC: fsl-asoc-card: Add snd_soc_of_parse_audio_routing() (diff) | |
| download | linux-1ddca24c532247894eb4430e9315e690306cf860.tar.xz linux-1ddca24c532247894eb4430e9315e690306cf860.zip | |
Merge branch 'topic/dapm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-core
Diffstat (limited to 'sound/soc/fsl/fsl-asoc-card.c')
| -rw-r--r-- | sound/soc/fsl/fsl-asoc-card.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index 3f6959c8e2f7..de438871040b 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -512,6 +512,12 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) memcpy(priv->dai_link, fsl_asoc_card_dai, sizeof(struct snd_soc_dai_link) * ARRAY_SIZE(priv->dai_link)); + ret = snd_soc_of_parse_audio_routing(&priv->card, "audio-routing"); + if (ret) { + dev_err(&pdev->dev, "failed to parse audio-routing: %d\n", ret); + goto asrc_fail; + } + /* Normal DAI Link */ priv->dai_link[0].cpu_of_node = cpu_np; priv->dai_link[0].codec_of_node = codec_np; |