From: Mark Brown <broonie@kernel.org>
Date: Mon, 22 Jun 2015 09:24:28 +0000 (+0100)
Subject: Merge remote-tracking branches 'asoc/topic/adsp' and 'asoc/topic/atmel' into asoc... 
X-Git-Tag: v4.2-rc3~17^2~17^2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=95baa281a384b5312ef5884b408e7cc4187b00e6;p=platform%2Fkernel%2Flinux-exynos.git

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

95baa281a384b5312ef5884b408e7cc4187b00e6
diff --cc sound/soc/codecs/wm5110.c
index 14a7739,ce7de94,fbaeddb..5f032a3
--- a/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;
   }