diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-05 04:07:20 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-05 04:07:20 +0300 |
| commit | 0af1327ba0393a98263b8d4244f21d1500a52271 (patch) | |
| tree | 689aba0d436890fbfe1b688c1ff1636ffc19cec1 /sound/soc/fsl | |
| parent | 1dfcab55e90500468f1a0646a8549e8eaa90cd7a (diff) | |
| parent | 3185878a70e721644b0e32ebbc0a039616551949 (diff) | |
| download | linux-0af1327ba0393a98263b8d4244f21d1500a52271.tar.xz | |
Merge remote-tracking branch 'asoc/topic/dapm-dt' into asoc-next
Diffstat (limited to 'sound/soc/fsl')
| -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; |