Merge remote-tracking branches 'asoc/fix/imx-spdif', 'asoc/fix/mtk', 'asoc/fix/mxs...

diff --combined sound/soc/codecs/rt286.c
index bc08f0c,bc08f0c,af2ed77,bc08f0c,af2ed77,af30b06..1bd3164
--- 1/sound/soc/codecs/rt286.c
--- 2/sound/soc/codecs/rt286.c
--- 3/sound/soc/codecs/rt286.c
--- 4/sound/soc/codecs/rt286.c
--- 5/sound/soc/codecs/rt286.c
--- 6/sound/soc/codecs/rt286.c
+++ b/sound/soc/codecs/rt286.c
@@@@@@@ -266,6 -266,6 -266,6 -266,6 -266,6 -266,8 +266,8 @@@@@@@ static int rt286_jack_detect(struct rt2
                } else {
                        *mic = false;
                        regmap_write(rt286->regmap, RT286_SET_MIC1, 0x20);
+++++                   regmap_update_bits(rt286->regmap,
+++++                           RT286_CBJ_CTRL1, 0x0400, 0x0000);
                }
        } else {
                regmap_read(rt286->regmap, RT286_GET_HP_SENSE, &buf);
@@@@@@@ -470,24 -470,24 -470,24 -470,24 -470,24 -472,6 +472,6 @@@@@@@ static int rt286_set_dmic1_event(struc
        return 0;
      }
      
----- static int rt286_vref_event(struct snd_soc_dapm_widget *w,
-----                        struct snd_kcontrol *kcontrol, int event)
----- {
-----   struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
----- 
-----   switch (event) {
-----   case SND_SOC_DAPM_PRE_PMU:
-----           snd_soc_update_bits(codec,
-----                   RT286_CBJ_CTRL1, 0x0400, 0x0000);
-----           mdelay(50);
-----           break;
-----   default:
-----           return 0;
-----   }
----- 
-----   return 0;
----- }
----- 
      static int rt286_ldo2_event(struct snd_soc_dapm_widget *w,
                             struct snd_kcontrol *kcontrol, int event)
      {
@@@@@@@ -536,7 -536,7 -536,7 -536,7 -536,7 -520,7 +520,7 @@@@@@@ static const struct snd_soc_dapm_widge
        SND_SOC_DAPM_SUPPLY_S("HV", 1, RT286_POWER_CTRL1,
                12, 1, NULL, 0),
        SND_SOC_DAPM_SUPPLY("VREF", RT286_POWER_CTRL1,
-----           0, 1, rt286_vref_event, SND_SOC_DAPM_PRE_PMU),
+++++           0, 1, NULL, 0),
        SND_SOC_DAPM_SUPPLY_S("LDO1", 1, RT286_POWER_CTRL2,
                2, 0, NULL, 0),
        SND_SOC_DAPM_SUPPLY_S("LDO2", 2, RT286_POWER_CTRL1,
@@@@@@@ -910,8 -910,8 -910,8 -910,8 -910,8 -894,6 +894,6 @@@@@@@ static int rt286_set_bias_level(struct 
      
        case SND_SOC_BIAS_ON:
                mdelay(10);
-----           snd_soc_update_bits(codec,
-----                   RT286_CBJ_CTRL1, 0x0400, 0x0400);
                snd_soc_update_bits(codec,
                        RT286_DC_GAIN, 0x200, 0x0);
      
@@@@@@@ -920,8 -920,8 -920,8 -920,8 -920,8 -902,6 +902,6 @@@@@@@
        case SND_SOC_BIAS_STANDBY:
                snd_soc_write(codec,
                        RT286_SET_AUDIO_POWER, AC_PWRST_D3);
-----           snd_soc_update_bits(codec,
-----                   RT286_CBJ_CTRL1, 0x0400, 0x0000);
                break;
      
        default:
@@@@@@@ -1114,12 -1114,12 -1114,6 -1114,12 -1114,6 -1094,6 +1094,12 @@@@@@@ static const struct dmi_system_id force
                        DMI_MATCH(DMI_BOARD_NAME, "Wilson Beach SDS")
                }
        },
  + ++  {
  + ++          .ident = "Intel Skylake RVP",
  + ++          .matches = {
  + ++                  DMI_MATCH(DMI_PRODUCT_NAME, "Skylake Client platform")
  + ++          }
  + ++  },
        { }
      };