Merge remote-tracking branches 'asoc/topic/adsp' and 'asoc/topic/atmel' into asoc...

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

diff --cc sound/soc/codecs/wm5110.c
index 14a7739d6c0960e89f7c698e7bb2b00d3dc7b5cf,ce7de949a50600e962766a5bf49f3a7a39ff8eb9,fbaeddb3e9033a3044b4995265dce2849b348160..5f032a37b61f38e08dbd311da7f2e8e481f558b0
--- 1/sound/soc/codecs/wm5110.c
--- 2/sound/soc/codecs/wm5110.c
--- 3/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@@@ -1598,21 -1598,24 -1598,22 +1598,23 @@@@ static struct snd_soc_dai_driver wm5110
   
   static int wm5110_codec_probe(struct snd_soc_codec *codec)
   {
 ++     struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
        struct wm5110_priv *priv = snd_soc_codec_get_drvdata(codec);
- -     int ret;
+ +     int i, ret;
   
 --     priv->core.arizona->dapm = &codec->dapm;
 ++     priv->core.arizona->dapm = dapm;
   
        arizona_init_spk(codec);
        arizona_init_gpio(codec);
        arizona_init_mono(codec);
   
- -     ret = snd_soc_add_codec_controls(codec, wm_adsp2_fw_controls, 8);
- -     if (ret != 0)
- -             return ret;
  -
  -     snd_soc_dapm_disable_pin(&codec->dapm, "HAPTICS");
+ +     for (i = 0; i < WM5110_NUM_ADSP; ++i) {
+ +             ret = wm_adsp2_codec_probe(&priv->core.adsp[i], codec);
+ +             if (ret)
+ +                     return ret;
+ +     }
   
 -      snd_soc_dapm_disable_pin(&codec->dapm, "HAPTICS");
 - 
 --     priv->core.arizona->dapm = &codec->dapm;
 ++     snd_soc_dapm_disable_pin(dapm, "HAPTICS");
   
        return 0;
   }