Merge branches 'topic/adsp' and 'topic/dapm' of git://git.kernel.org/pub/scm/linux...

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

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

diff --cc sound/soc/codecs/wm5110.c
index ce7de949a50600e962766a5bf49f3a7a39ff8eb9,67960009f0c456589b845b87bf776c1af23b1b58..2265967234188244a378276a90c362ee0c5c15fe
--- 1/sound/soc/codecs/wm5110.c
--- 2/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@@ -1598,24 -1598,21 +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;
 +      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;
  }

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