Merge remote-tracking branches 'asoc/topic/rt5563', 'asoc/topic/rt5616', 'asoc/topic...

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

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

diff --cc sound/soc/codecs/rt5663.c
index 7a6b1bb0b4377db7a2c8c774d1791bf9b819b8d6,271cc81f2aef121d84bc80d027145cb8f0cd720e,a33202affeb123aca338303d9d9c61bd7d5f5f39,a33202affeb123aca338303d9d9c61bd7d5f5f39,a33202affeb123aca338303d9d9c61bd7d5f5f39,14716d25173b90acba3e132fc21aa4e552fbfa7e..ab9e0ebff5a7ffe8c24a026441538c6bd877a733
--- 1/sound/soc/codecs/rt5663.c
--- 2/sound/soc/codecs/rt5663.c
--- 3/sound/soc/codecs/rt5663.c
--- 4/sound/soc/codecs/rt5663.c
--- 5/sound/soc/codecs/rt5663.c
--- 6/sound/soc/codecs/rt5663.c
+++ b/sound/soc/codecs/rt5663.c
@@@@@@@ -3020,25 -3020,25 -3020,25 -3020,25 -3020,25 -3121,72 +3121,72 @@@@@@@ static void rt5663_calibrate(struct rt5
        regmap_write(rt5663->regmap, RT5663_STO1_HPF_ADJ1, 0x3320);
        regmap_write(rt5663->regmap, RT5663_HP_CALIB_2, 0x00c9);
        regmap_write(rt5663->regmap, RT5663_DUMMY_1, 0x004c);
-----   regmap_write(rt5663->regmap, RT5663_ANA_BIAS_CUR_1, 0x7766);
-----   regmap_write(rt5663->regmap, RT5663_BIAS_CUR_8, 0x4702);
-----   msleep(200);
+++++   regmap_write(rt5663->regmap, RT5663_ANA_BIAS_CUR_1, 0x1111);
+++++   regmap_write(rt5663->regmap, RT5663_BIAS_CUR_8, 0x4402);
+++++   regmap_write(rt5663->regmap, RT5663_CHARGE_PUMP_2, 0x3311);
        regmap_write(rt5663->regmap, RT5663_HP_CALIB_1, 0x0069);
-----   regmap_write(rt5663->regmap, RT5663_HP_CALIB_3, 0x06c2);
-----   regmap_write(rt5663->regmap, RT5663_HP_CALIB_1_1, 0x7b00);
-----   regmap_write(rt5663->regmap, RT5663_HP_CALIB_1_1, 0xfb00);
+++++   regmap_write(rt5663->regmap, RT5663_HP_CALIB_3, 0x06ce);
+++++   regmap_write(rt5663->regmap, RT5663_HP_CALIB_1_1, 0x6800);
+++++   regmap_write(rt5663->regmap, RT5663_CHARGE_PUMP_2, 0x1100);
+++++   regmap_write(rt5663->regmap, RT5663_HP_CALIB_7, 0x0057);
+++++   regmap_write(rt5663->regmap, RT5663_HP_CALIB_1_1, 0xe800);
+++++ 
+       count = 0;
+       while (true) {
+               regmap_read(rt5663->regmap, RT5663_HP_CALIB_1_1, &value);
+               if (value & 0x8000)
+                       usleep_range(10000, 10005);
+               else
+                       break;
+     
+               if (count > 200)
+                       return;
+               count++;
+       }
+++++ 
+++++   regmap_write(rt5663->regmap, RT5663_HP_CALIB_1_1, 0x6200);
+++++   regmap_write(rt5663->regmap, RT5663_HP_CALIB_7, 0x0059);
+++++   regmap_write(rt5663->regmap, RT5663_HP_CALIB_1_1, 0xe200);
+++++ 
 ++++   count = 0;
 ++++   while (true) {
 ++++           regmap_read(rt5663->regmap, RT5663_HP_CALIB_1_1, &value);
 ++++           if (value & 0x8000)
 ++++                   usleep_range(10000, 10005);
 ++++           else
 ++++                   break;
 ++++ 
 ++++           if (count > 200)
 ++++                   return;
 ++++           count++;
 ++++   }
+++++ 
+++++   regmap_write(rt5663->regmap, RT5663_EM_JACK_TYPE_1, 0xb8e0);
+++++   usleep_range(10000, 10005);
+++++   regmap_write(rt5663->regmap, RT5663_PWR_ANLG_1, 0x003b);
+++++   usleep_range(10000, 10005);
+++++   regmap_write(rt5663->regmap, RT5663_PWR_DIG_1, 0x0000);
+++++   usleep_range(10000, 10005);
+++++   regmap_write(rt5663->regmap, RT5663_DEPOP_1, 0x000b);
+++++   usleep_range(10000, 10005);
+++++   regmap_write(rt5663->regmap, RT5663_DEPOP_1, 0x0008);
+++++   usleep_range(10000, 10005);
+++++   regmap_write(rt5663->regmap, RT5663_PWR_ANLG_2, 0x0000);
+++++   usleep_range(10000, 10005);
+++++ }
+++++ 
+++++ static int rt5663_parse_dp(struct rt5663_priv *rt5663, struct device *dev)
+++++ {
+++++   device_property_read_u32(dev, "realtek,dc_offset_l_manual",
+++++           &rt5663->pdata.dc_offset_l_manual);
+++++   device_property_read_u32(dev, "realtek,dc_offset_r_manual",
+++++           &rt5663->pdata.dc_offset_r_manual);
+++++   device_property_read_u32(dev, "realtek,dc_offset_l_manual_mic",
+++++           &rt5663->pdata.dc_offset_l_manual_mic);
+++++   device_property_read_u32(dev, "realtek,dc_offset_r_manual_mic",
+++++           &rt5663->pdata.dc_offset_r_manual_mic);
+++++ 
+++++   return 0;
      }
      
      static int rt5663_i2c_probe(struct i2c_client *i2c,