Merge remote-tracking branches 'asoc/fix/alc5632', 'asoc/fix/cs42l52', 'asoc/fix...

diff --cc sound/soc/codecs/max98090.c
index 98c6e104357cbe59416f8d602a24ec63e1b68696,98c6e104357cbe59416f8d602a24ec63e1b68696,98c6e104357cbe59416f8d602a24ec63e1b68696,98c6e104357cbe59416f8d602a24ec63e1b68696,98c6e104357cbe59416f8d602a24ec63e1b68696,98c6e104357cbe59416f8d602a24ec63e1b68696,51f9b3d16b41dbf4cc80dddc6d0a081ccb83fe90,98c6e104357cbe59416f8d602a24ec63e1b68696,83a773c11ddb0f055b28b70ccbd4062d77b55d06..f7b0b37aa85827e7cd45a8afda039078c7079f0e
--- 1/sound/soc/codecs/max98090.c
--- 2/sound/soc/codecs/max98090.c
--- 3/sound/soc/codecs/max98090.c
--- 4/sound/soc/codecs/max98090.c
--- 5/sound/soc/codecs/max98090.c
--- 6/sound/soc/codecs/max98090.c
--- 7/sound/soc/codecs/max98090.c
--- 8/sound/soc/codecs/max98090.c
--- 9/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@@@@@@@@@ -872,7 -872,7 -872,7 -872,7 -872,7 -872,7 -859,8 -872,7 -871,7 +872,7 @@@@@@@@@@ static const struct snd_kcontrol_new ma
         
         static const char *dmic_mux_text[] = { "ADC", "DMIC" };
         
      -  static const struct soc_enum dmic_mux_enum =
      -         SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(dmic_mux_text), dmic_mux_text);
        -static SOC_ENUM_SINGLE_EXT_DECL(dmic_mux_enum, dmic_mux_text);
      + +static SOC_ENUM_SINGLE_VIRT_DECL(dmic_mux_enum, dmic_mux_text);
         
         static const struct snd_kcontrol_new max98090_dmic_mux =
                SOC_DAPM_ENUM_VIRT("DMIC Mux", dmic_mux_enum);