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

diff --cc sound/soc/codecs/rt5645.c
index 5da29374cd1d95991d77e024500982063cb1900f,aaede45a2f4bd13efdaad75ca54e88bf3b7b18d8..d5f0f5680d3b1441a84c43acdba2d336d5520df2
--- 1/sound/soc/codecs/rt5645.c
--- 2/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);