Merge remote-tracking branch 'asoc/topic/dapm-dt' into asoc-next

This commit is contained in:
Mark Brown
2015-03-05 01:07:20 +00:00
förälder 1dfcab55e9 3185878a70
incheckning 0af1327ba0
3 ändrade filer med 23 tillägg och 4 borttagningar

Visa fil

@@ -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;