From: Mark Brown <broonie@kernel.org>
Date: Fri, 26 Jan 2018 15:27:22 +0000 (+0000)
Subject: Merge remote-tracking branches 'asoc/topic/mtk', 'asoc/topic/mxs', 'asoc/topic/mxs... 
X-Git-Tag: v4.19~773^2~32^2~69^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=19c2d84997beaf06327e392071c2dbe98602c56b;p=platform%2Fkernel%2Flinux-rpi3.git

Merge remote-tracking branches 'asoc/topic/mtk', 'asoc/topic/mxs', 'asoc/topic/mxs-sgtl5000', 'asoc/topic/nau8540' and 'asoc/topic/nau8824' into asoc-next
---

19c2d84997beaf06327e392071c2dbe98602c56b
diff --cc sound/soc/mxs/mxs-sgtl5000.c
index 2ed3240,2ed3240,b593f76,5a871f2,2ed3240,2ed3240..2b3f240
--- a/sound/soc/mxs/mxs-sgtl5000.c
+++ b/sound/soc/mxs/mxs-sgtl5000.c
@@@@@@@ -141,10 -141,10 -149,22 -141,11 -141,10 -141,10 +149,23 @@@@@@@ static int mxs_sgtl5000_probe(struct pl
      
      	card->dev = &pdev->dev;
      
++ +++	if (of_find_property(np, "audio-routing", NULL)) {
++ +++		card->dapm_widgets = mxs_sgtl5000_dapm_widgets;
++ +++		card->num_dapm_widgets = ARRAY_SIZE(mxs_sgtl5000_dapm_widgets);
++ +++
++ +++		ret = snd_soc_of_parse_audio_routing(card, "audio-routing");
++ +++		if (ret) {
++ +++			dev_err(&pdev->dev, "failed to parse audio-routing (%d)\n",
++ +++				ret);
++ +++			return ret;
++ +++		}
++ +++	}
++ +++
      	ret = devm_snd_soc_register_card(&pdev->dev, card);
      	if (ret) {
--- --		dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",
--- --			ret);
+++ ++		if (ret != -EPROBE_DEFER)
+++ ++			dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",
+++ ++				ret);
      		return ret;
      	}