Merge remote-tracking branches 'asoc/topic/mxs', 'asoc/topic/mxs-sgtl5000', 'asoc...

diff --cc sound/soc/codecs/nau8825.c
Simple merge

diff --cc sound/soc/mxs/mxs-sgtl5000.c
index 2ed3240cc68210b38ac4b215f0eddc4bff2d943b,b593f76212e0c5c857354c33563684a4970f2ddb,5a871f25f438f4d091b79e3fc68fe418da0ad940,2ed3240cc68210b38ac4b215f0eddc4bff2d943b,2ed3240cc68210b38ac4b215f0eddc4bff2d943b,2ed3240cc68210b38ac4b215f0eddc4bff2d943b..2b3f2408301af2132ae09759ae96f7d73160f1a4
--- 1/sound/soc/mxs/mxs-sgtl5000.c
--- 2/sound/soc/mxs/mxs-sgtl5000.c
--- 3/sound/soc/mxs/mxs-sgtl5000.c
--- 4/sound/soc/mxs/mxs-sgtl5000.c
--- 5/sound/soc/mxs/mxs-sgtl5000.c
--- 6/sound/soc/mxs/mxs-sgtl5000.c
+++ b/sound/soc/mxs/mxs-sgtl5000.c
@@@@@@@ -141,10 -149,22 -141,11 -141,10 -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;
        }