ASoC: Merge tag 'v3.4-rc3' into for-3.5

Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.

Conflicts:
	sound/soc/soc-core.c
	sound/soc/tegra/tegra_i2s.c
	sound/soc/tegra/tegra_spdif.c

diff --cc MAINTAINERS
Simple merge

diff --cc sound/soc/codecs/sgtl5000.c
index 9538d41,8e92fb8..8005fe6
--- 1/sound/soc/codecs/sgtl5000.c
--- 2/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@@ -197,16 -197,12 +197,12 @@@ static const struct snd_soc_dapm_widge
        SND_SOC_DAPM_OUTPUT("HP_OUT"),
        SND_SOC_DAPM_OUTPUT("LINE_OUT"),
  
 -      SND_SOC_DAPM_MICBIAS_E("Mic Bias", SGTL5000_CHIP_MIC_CTRL, 8, 0,
 -                              mic_bias_event,
 -                              SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
 +      SND_SOC_DAPM_SUPPLY("Mic Bias", SGTL5000_CHIP_MIC_CTRL, 8, 0,
 +                          mic_bias_event,
 +                          SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
  
-       SND_SOC_DAPM_PGA_E("HP", SGTL5000_CHIP_ANA_POWER, 4, 0, NULL, 0,
-                       small_pop_event,
-                       SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD),
-       SND_SOC_DAPM_PGA_E("LO", SGTL5000_CHIP_ANA_POWER, 0, 0, NULL, 0,
-                       small_pop_event,
-                       SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD),
+       SND_SOC_DAPM_PGA("HP", SGTL5000_CHIP_ANA_POWER, 4, 0, NULL, 0),
+       SND_SOC_DAPM_PGA("LO", SGTL5000_CHIP_ANA_POWER, 0, 0, NULL, 0),
  
        SND_SOC_DAPM_MUX("Capture Mux", SND_SOC_NOPM, 0, 0, &adc_mux),
        SND_SOC_DAPM_MUX("Headphone Mux", SND_SOC_NOPM, 0, 0, &dac_mux),

diff --cc sound/soc/fsl/imx-audmux.c
Simple merge

diff --cc sound/soc/pxa/pxa2xx-i2s.c
Simple merge

diff --cc sound/soc/soc-core.c
index 77f3529,accdcb7..5d308e9
--- 1/sound/soc/soc-core.c
--- 2/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@@ -1064,14 -1081,8 +1064,16 @@@ static int soc_probe_platform(struct sn
                snd_soc_dapm_new_controls(&platform->dapm,
                        driver->dapm_widgets, driver->num_dapm_widgets);
  
 +      /* Create DAPM widgets for each DAI stream */
 +      list_for_each_entry(dai, &dai_list, list) {
 +              if (dai->dev != platform->dev)
 +                      continue;
 +
 +              snd_soc_dapm_new_dai_widgets(&platform->dapm, dai);
 +      }
 +
+       platform->dapm.idle_bias_off = 1;
+ 
        if (driver->probe) {
                ret = driver->probe(platform);
                if (ret < 0) {