From: Mark Brown <broonie@kernel.org>
Date: Fri, 5 Jun 2015 17:54:46 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/topic/rt5645' into asoc-next
X-Git-Tag: v4.9.8~3567^2~116^2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f3b368d3b9a22bb1ddc80808a64ecb7559791e87;p=platform%2Fkernel%2Flinux-rpi3.git

Merge remote-tracking branch 'asoc/topic/rt5645' into asoc-next
---

f3b368d3b9a22bb1ddc80808a64ecb7559791e87
diff --cc sound/soc/codecs/rt5645.c
index 5da2937,aaede45..d5f0f56
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@@ -2520,12 -3062,10 +3061,10 @@@ static int rt5645_probe(struct snd_soc_
  		break;
  	}
  
 -	rt5645_set_bias_level(codec, SND_SOC_BIAS_OFF);
 +	snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_OFF);
  
- 	snd_soc_update_bits(codec, RT5645_CHARGE_PUMP, 0x0300, 0x0200);
- 
  	/* for JD function */
- 	if (rt5645->pdata.en_jd_func) {
+ 	if (rt5645->pdata.jd_mode) {
  		snd_soc_dapm_force_enable_pin(&codec->dapm, "JD Power");
  		snd_soc_dapm_force_enable_pin(&codec->dapm, "LDO2");
  		snd_soc_dapm_sync(&codec->dapm);