Merge remote-tracking branches 'asoc/topic/rt5670', 'asoc/topic/rt5677', 'asoc/topic...

diff --combined sound/soc/codecs/wm_adsp.c
index ff67b334065badc1011807648ac671a4d07765bf,720d6e852986c3e7c6b0b1128876b7c4c4fa4ffb,ff67b334065badc1011807648ac671a4d07765bf,ff67b334065badc1011807648ac671a4d07765bf,ff67b334065badc1011807648ac671a4d07765bf,e625cedb0fa96263f3340eb7582bac87c1ff513c..d01c2095452f9a0aaa5a2f1e91d2753fd48b1500
--- 1/sound/soc/codecs/wm_adsp.c
--- 2/sound/soc/codecs/wm_adsp.c
--- 3/sound/soc/codecs/wm_adsp.c
--- 4/sound/soc/codecs/wm_adsp.c
--- 5/sound/soc/codecs/wm_adsp.c
--- 6/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@@@@@@ -420,10 -420,10 -420,10 -420,10 -420,10 -420,9 +420,9 @@@@@@@ static int wm_coeff_put(struct snd_kcon
      
        memcpy(ctl->cache, p, ctl->len);
      
-----   if (!ctl->enabled) {
-----           ctl->set = 1;
+++++   ctl->set = 1;
+++++   if (!ctl->enabled)
                return 0;
-----   }
      
        return wm_coeff_write_control(kcontrol, p, ctl->len);
      }
@@@@@@@ -1185,7 -1185,7 -1185,7 -1185,7 -1185,7 -1184,6 +1184,6 @@@@@@@ static int wm_adsp_load_coeff(struct wm
        int ret, pos, blocks, type, offset, reg;
        char *file;
        struct wm_adsp_buf *buf;
-----   int tmp;
      
        file = kzalloc(PAGE_SIZE, GFP_KERNEL);
        if (file == NULL)
@@@@@@@ -1335,12 -1335,12 -1335,12 -1335,12 -1335,12 -1333,7 +1333,7 @@@@@@@
                        }
                }
      
-----           tmp = le32_to_cpu(blk->len) % 4;
-----           if (tmp)
-----                   pos += le32_to_cpu(blk->len) + (4 - tmp) + sizeof(*blk);
-----           else
-----                   pos += le32_to_cpu(blk->len) + sizeof(*blk);
----- 
+++++           pos += (le32_to_cpu(blk->len) + sizeof(*blk) + 3) & ~0x03;
                blocks++;
        }
      
@@@@@@@ -1373,7 -1373,7 -1373,7 -1373,7 -1373,7 -1366,7 +1366,7 @@@@@@@ int wm_adsp1_event(struct snd_soc_dapm_
                   struct snd_kcontrol *kcontrol,
                   int event)
      {
 -   -  struct snd_soc_codec *codec = w->codec;
 +   +  struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
        struct wm_adsp *dsps = snd_soc_codec_get_drvdata(codec);
        struct wm_adsp *dsp = &dsps[w->shift];
        struct wm_adsp_alg_region *alg_region;
@@@@@@@ -1605,7 -1605,7 -1605,7 -1605,7 -1605,7 -1598,7 +1598,7 @@@@@@@ err
      int wm_adsp2_early_event(struct snd_soc_dapm_widget *w,
                   struct snd_kcontrol *kcontrol, int event)
      {
 -   -  struct snd_soc_codec *codec = w->codec;
 +   +  struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
        struct wm_adsp *dsps = snd_soc_codec_get_drvdata(codec);
        struct wm_adsp *dsp = &dsps[w->shift];
      
@@@@@@@ -1626,7 -1626,7 -1626,7 -1626,7 -1626,7 -1619,7 +1619,7 @@@@@@@ EXPORT_SYMBOL_GPL(wm_adsp2_early_event)
      int wm_adsp2_event(struct snd_soc_dapm_widget *w,
                   struct snd_kcontrol *kcontrol, int event)
      {
 -   -  struct snd_soc_codec *codec = w->codec;
 +   +  struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
        struct wm_adsp *dsps = snd_soc_codec_get_drvdata(codec);
        struct wm_adsp *dsp = &dsps[w->shift];
        struct wm_adsp_alg_region *alg_region;

diff --combined sound/soc/tegra/tegra_max98090.c
index 6760f0ebc1338881cd243b658315a57f8b814da9,af3fb997b75228927f4a32b53d65eb78938efd22,af3fb997b75228927f4a32b53d65eb78938efd22,af3fb997b75228927f4a32b53d65eb78938efd22,1f20c2c40a5af0e1dbe35bb1fff049b44547616a,af3fb997b75228927f4a32b53d65eb78938efd22..902da36581d1ba8af25494b8e69a2fec4415b1eb
--- 1/sound/soc/tegra/tegra_max98090.c
--- 2/sound/soc/tegra/tegra_max98090.c
--- 3/sound/soc/tegra/tegra_max98090.c
--- 4/sound/soc/tegra/tegra_max98090.c
--- 5/sound/soc/tegra/tegra_max98090.c
--- 6/sound/soc/tegra/tegra_max98090.c
+++ b/sound/soc/tegra/tegra_max98090.c
@@@@@@@ -133,22 -133,24 -133,24 -133,24 -133,28 -133,24 +133,26 @@@@@@@ static const struct snd_soc_dapm_widge
        SND_SOC_DAPM_HP("Headphones", NULL),
        SND_SOC_DAPM_SPK("Speakers", NULL),
        SND_SOC_DAPM_MIC("Mic Jack", NULL),
++++ +  SND_SOC_DAPM_MIC("Int Mic", NULL),
      };
      
      static const struct snd_kcontrol_new tegra_max98090_controls[] = {
++++ +  SOC_DAPM_PIN_SWITCH("Headphones"),
        SOC_DAPM_PIN_SWITCH("Speakers"),
++++ +  SOC_DAPM_PIN_SWITCH("Mic Jack"),
++++ +  SOC_DAPM_PIN_SWITCH("Int Mic"),
      };
      
      static int tegra_max98090_asoc_init(struct snd_soc_pcm_runtime *rtd)
      {
 -----  struct snd_soc_dai *codec_dai = rtd->codec_dai;
 -----  struct snd_soc_codec *codec = codec_dai->codec;
        struct tegra_max98090 *machine = snd_soc_card_get_drvdata(rtd->card);
      
        if (gpio_is_valid(machine->gpio_hp_det)) {
 -----          snd_soc_jack_new(codec, "Headphones", SND_JACK_HEADPHONE,
 -----                          &tegra_max98090_hp_jack);
 -----          snd_soc_jack_add_pins(&tegra_max98090_hp_jack,
 -----                          ARRAY_SIZE(tegra_max98090_hp_jack_pins),
 -----                          tegra_max98090_hp_jack_pins);
 +++++          snd_soc_card_jack_new(rtd->card, "Headphones",
 +++++                                SND_JACK_HEADPHONE,
 +++++                                &tegra_max98090_hp_jack,
 +++++                                tegra_max98090_hp_jack_pins,
 +++++                                ARRAY_SIZE(tegra_max98090_hp_jack_pins));
      
                tegra_max98090_hp_jack_gpio.gpio = machine->gpio_hp_det;
                snd_soc_jack_add_gpios(&tegra_max98090_hp_jack,
@@@@@@@ -157,11 -159,11 -159,11 -159,11 -163,11 -159,11 +161,11 @@@@@@@
        }
      
        if (gpio_is_valid(machine->gpio_mic_det)) {
 -----          snd_soc_jack_new(codec, "Mic Jack", SND_JACK_MICROPHONE,
 -----                           &tegra_max98090_mic_jack);
 -----          snd_soc_jack_add_pins(&tegra_max98090_mic_jack,
 -----                                ARRAY_SIZE(tegra_max98090_mic_jack_pins),
 -----                                tegra_max98090_mic_jack_pins);
 +++++          snd_soc_card_jack_new(rtd->card, "Mic Jack",
 +++++                                SND_JACK_MICROPHONE,
 +++++                                &tegra_max98090_mic_jack,
 +++++                                tegra_max98090_mic_jack_pins,
 +++++                                ARRAY_SIZE(tegra_max98090_mic_jack_pins));
      
                tegra_max98090_mic_jack_gpio.gpio = machine->gpio_mic_det;
                snd_soc_jack_add_gpios(&tegra_max98090_mic_jack,