Merge remote-tracking branch 'asoc/fix/arizona' into tmp

diff --combined sound/soc/codecs/wm5102.c
index b8d461db369f1f2952fb562f9ce78ddd74e5e069,cef288cf99985e1710a2ff3e948a3bba08b45431..b82bbf584146dc0b7c1bbaeb416a96f03f0d67af
--- 1/sound/soc/codecs/wm5102.c
--- 2/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@@ -573,6 -573,13 +573,13 @@@ static const struct reg_default wm5102_
        { 0x025e, 0x0112 },
  };
  
+ static const struct reg_default wm5102_sysclk_revb_patch[] = {
+       { 0x3081, 0x08FE },
+       { 0x3083, 0x00ED },
+       { 0x30C1, 0x08FE },
+       { 0x30C3, 0x00ED },
+ };
+ 
  static int wm5102_sysclk_ev(struct snd_soc_dapm_widget *w,
                            struct snd_kcontrol *kcontrol, int event)
  {
@@@ -587,6 -594,10 +594,10 @@@
                patch = wm5102_sysclk_reva_patch;
                patch_size = ARRAY_SIZE(wm5102_sysclk_reva_patch);
                break;
+       default:
+               patch = wm5102_sysclk_revb_patch;
+               patch_size = ARRAY_SIZE(wm5102_sysclk_revb_patch);
+               break;
        }
  
        switch (event) {
@@@ -755,7 -766,7 +766,7 @@@ SOC_SINGLE("SPKDAT1 High Performance Sw
  
  SOC_DOUBLE_R("HPOUT1 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_1L,
             ARIZONA_DAC_DIGITAL_VOLUME_1R, ARIZONA_OUT1L_MUTE_SHIFT, 1, 1),
- SOC_DOUBLE_R("OUT2 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_2L,
+ SOC_DOUBLE_R("HPOUT2 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_2L,
             ARIZONA_DAC_DIGITAL_VOLUME_2R, ARIZONA_OUT2L_MUTE_SHIFT, 1, 1),
  SOC_SINGLE("EPOUT Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_3L,
           ARIZONA_OUT3L_MUTE_SHIFT, 1, 1),
@@@ -767,7 -778,7 +778,7 @@@ SOC_DOUBLE_R("SPKDAT1 Digital Switch", 
  SOC_DOUBLE_R_TLV("HPOUT1 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_1L,
                 ARIZONA_DAC_DIGITAL_VOLUME_1R, ARIZONA_OUT1L_VOL_SHIFT,
                 0xbf, 0, digital_tlv),
- SOC_DOUBLE_R_TLV("OUT2 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_2L,
+ SOC_DOUBLE_R_TLV("HPOUT2 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_2L,
                 ARIZONA_DAC_DIGITAL_VOLUME_2R, ARIZONA_OUT2L_VOL_SHIFT,
                 0xbf, 0, digital_tlv),
  SOC_SINGLE_TLV("EPOUT Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_3L,
@@@ -1223,8 -1234,6 +1234,8 @@@ SND_SOC_DAPM_OUTPUT("SPKOUTRN")
  SND_SOC_DAPM_OUTPUT("SPKOUTRP"),
  SND_SOC_DAPM_OUTPUT("SPKDAT1L"),
  SND_SOC_DAPM_OUTPUT("SPKDAT1R"),
 +
 +SND_SOC_DAPM_OUTPUT("MICSUPP"),
  };
  
  #define ARIZONA_MIXER_INPUT_ROUTES(name)      \
@@@ -1469,8 -1478,6 +1480,8 @@@ static const struct snd_soc_dapm_route 
        { "AEC Loopback", "SPKDAT1R", "OUT5R" },
        { "SPKDAT1L", NULL, "OUT5L" },
        { "SPKDAT1R", NULL, "OUT5R" },
 +
 +      { "MICSUPP", NULL, "SYSCLK" },
  };
  
  static int wm5102_set_fll(struct snd_soc_codec *codec, int fll_id, int source,

diff --combined sound/soc/codecs/wm5110.c
index cd17b477781d8b370aa78eb2eadad86dcdd4cc31,1a97263634e4e13d1caa09a87c27d9368c5cb73c..cdeb301da1f69221f065ccf7f07bfa290e0e9dff
--- 1/sound/soc/codecs/wm5110.c
--- 2/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@@ -213,9 -213,9 +213,9 @@@ ARIZONA_MIXER_CONTROLS("SPKDAT2R", ARIZ
  
  SOC_SINGLE("HPOUT1 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_1L,
           ARIZONA_OUT1_OSR_SHIFT, 1, 0),
- SOC_SINGLE("OUT2 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_2L,
+ SOC_SINGLE("HPOUT2 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_2L,
           ARIZONA_OUT2_OSR_SHIFT, 1, 0),
- SOC_SINGLE("OUT3 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_3L,
+ SOC_SINGLE("HPOUT3 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_3L,
           ARIZONA_OUT3_OSR_SHIFT, 1, 0),
  SOC_SINGLE("Speaker High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_4L,
           ARIZONA_OUT4_OSR_SHIFT, 1, 0),
@@@ -226,9 -226,9 +226,9 @@@ SOC_SINGLE("SPKDAT2 High Performance Sw
  
  SOC_DOUBLE_R("HPOUT1 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_1L,
             ARIZONA_DAC_DIGITAL_VOLUME_1R, ARIZONA_OUT1L_MUTE_SHIFT, 1, 1),
- SOC_DOUBLE_R("OUT2 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_2L,
+ SOC_DOUBLE_R("HPOUT2 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_2L,
             ARIZONA_DAC_DIGITAL_VOLUME_2R, ARIZONA_OUT2L_MUTE_SHIFT, 1, 1),
- SOC_DOUBLE_R("OUT3 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_3L,
+ SOC_DOUBLE_R("HPOUT3 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_3L,
             ARIZONA_DAC_DIGITAL_VOLUME_3R, ARIZONA_OUT3L_MUTE_SHIFT, 1, 1),
  SOC_DOUBLE_R("Speaker Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_4L,
             ARIZONA_DAC_DIGITAL_VOLUME_4R, ARIZONA_OUT4L_MUTE_SHIFT, 1, 1),
@@@ -240,10 -240,10 +240,10 @@@ SOC_DOUBLE_R("SPKDAT2 Digital Switch", 
  SOC_DOUBLE_R_TLV("HPOUT1 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_1L,
                 ARIZONA_DAC_DIGITAL_VOLUME_1R, ARIZONA_OUT1L_VOL_SHIFT,
                 0xbf, 0, digital_tlv),
- SOC_DOUBLE_R_TLV("OUT2 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_2L,
+ SOC_DOUBLE_R_TLV("HPOUT2 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_2L,
                 ARIZONA_DAC_DIGITAL_VOLUME_2R, ARIZONA_OUT2L_VOL_SHIFT,
                 0xbf, 0, digital_tlv),
- SOC_DOUBLE_R_TLV("OUT3 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_3L,
+ SOC_DOUBLE_R_TLV("HPOUT3 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_3L,
                 ARIZONA_DAC_DIGITAL_VOLUME_3R, ARIZONA_OUT3L_VOL_SHIFT,
                 0xbf, 0, digital_tlv),
  SOC_DOUBLE_R_TLV("Speaker Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_4L,
@@@ -260,11 -260,11 +260,11 @@@ SOC_DOUBLE_R_RANGE_TLV("HPOUT1 Volume"
                       ARIZONA_OUTPUT_PATH_CONFIG_1R,
                       ARIZONA_OUT1L_PGA_VOL_SHIFT,
                       0x34, 0x40, 0, ana_tlv),
- SOC_DOUBLE_R_RANGE_TLV("OUT2 Volume", ARIZONA_OUTPUT_PATH_CONFIG_2L,
+ SOC_DOUBLE_R_RANGE_TLV("HPOUT2 Volume", ARIZONA_OUTPUT_PATH_CONFIG_2L,
                       ARIZONA_OUTPUT_PATH_CONFIG_2R,
                       ARIZONA_OUT2L_PGA_VOL_SHIFT,
                       0x34, 0x40, 0, ana_tlv),
- SOC_DOUBLE_R_RANGE_TLV("OUT3 Volume", ARIZONA_OUTPUT_PATH_CONFIG_3L,
+ SOC_DOUBLE_R_RANGE_TLV("HPOUT3 Volume", ARIZONA_OUTPUT_PATH_CONFIG_3L,
                       ARIZONA_OUTPUT_PATH_CONFIG_3R,
                       ARIZONA_OUT3L_PGA_VOL_SHIFT, 0x34, 0x40, 0, ana_tlv),
  
@@@ -656,8 -656,6 +656,8 @@@ SND_SOC_DAPM_OUTPUT("SPKDAT1L")
  SND_SOC_DAPM_OUTPUT("SPKDAT1R"),
  SND_SOC_DAPM_OUTPUT("SPKDAT2L"),
  SND_SOC_DAPM_OUTPUT("SPKDAT2R"),
 +
 +SND_SOC_DAPM_OUTPUT("MICSUPP"),
  };
  
  #define ARIZONA_MIXER_INPUT_ROUTES(name)      \
@@@ -866,8 -864,6 +866,8 @@@ static const struct snd_soc_dapm_route 
  
        { "SPKDAT2L", NULL, "OUT6L" },
        { "SPKDAT2R", NULL, "OUT6R" },
 +
 +      { "MICSUPP", NULL, "SYSCLK" },
  };
  
  static int wm5110_set_fll(struct snd_soc_codec *codec, int fll_id, int source,