From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 26 Jan 2015 12:53:41 +0000 (+0100)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: v4.0-rc1~129^2~41
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7533185eeefd087d5472422181ae8edf75118213;p=uclinux-h8%2Flinux.git

Merge branch 'for-linus' into for-next

Sync with the latest 3.19-rc state for applying other ALSA sequencer
core fixes.
---

7533185eeefd087d5472422181ae8edf75118213
diff --cc sound/soc/codecs/rt5677.c
index 890022171359,918ada9738b0..d27630accf03
--- a/sound/soc/codecs/rt5677.c
+++ b/sound/soc/codecs/rt5677.c
@@@ -2303,49 -2220,12 +2311,51 @@@ static int rt5677_vref_event(struct snd
  
  static const struct snd_soc_dapm_widget rt5677_dapm_widgets[] = {
  	SND_SOC_DAPM_SUPPLY("PLL1", RT5677_PWR_ANLG2, RT5677_PWR_PLL1_BIT,
- 		0, rt5677_set_pll1_event, SND_SOC_DAPM_POST_PMU),
+ 		0, rt5677_set_pll1_event, SND_SOC_DAPM_PRE_PMU |
+ 		SND_SOC_DAPM_POST_PMU),
  	SND_SOC_DAPM_SUPPLY("PLL2", RT5677_PWR_ANLG2, RT5677_PWR_PLL2_BIT,
- 		0, rt5677_set_pll2_event, SND_SOC_DAPM_POST_PMU),
+ 		0, rt5677_set_pll2_event, SND_SOC_DAPM_PRE_PMU |
+ 		SND_SOC_DAPM_POST_PMU),
  
 +	/* ASRC */
 +	SND_SOC_DAPM_SUPPLY_S("I2S1 ASRC", 1, RT5677_ASRC_1, 0, 0, NULL, 0),
 +	SND_SOC_DAPM_SUPPLY_S("I2S2 ASRC", 1, RT5677_ASRC_1, 1, 0, NULL, 0),
 +	SND_SOC_DAPM_SUPPLY_S("I2S3 ASRC", 1, RT5677_ASRC_1, 2, 0, NULL, 0),
 +	SND_SOC_DAPM_SUPPLY_S("I2S4 ASRC", 1, RT5677_ASRC_1, 3, 0, NULL, 0),
 +	SND_SOC_DAPM_SUPPLY_S("DAC STO ASRC", 1, RT5677_ASRC_2, 14, 0, NULL, 0),
 +	SND_SOC_DAPM_SUPPLY_S("DAC MONO2 L ASRC", 1, RT5677_ASRC_2, 13, 0, NULL,
 +		0),
 +	SND_SOC_DAPM_SUPPLY_S("DAC MONO2 R ASRC", 1, RT5677_ASRC_2, 12, 0, NULL,
 +		0),
 +	SND_SOC_DAPM_SUPPLY_S("DAC MONO3 L ASRC", 1, RT5677_ASRC_1, 15, 0, NULL,
 +		0),
 +	SND_SOC_DAPM_SUPPLY_S("DAC MONO3 R ASRC", 1, RT5677_ASRC_1, 14, 0, NULL,
 +		0),
 +	SND_SOC_DAPM_SUPPLY_S("DAC MONO4 L ASRC", 1, RT5677_ASRC_1, 13, 0, NULL,
 +		0),
 +	SND_SOC_DAPM_SUPPLY_S("DAC MONO4 R ASRC", 1, RT5677_ASRC_1, 12, 0, NULL,
 +		0),
 +	SND_SOC_DAPM_SUPPLY_S("DMIC STO1 ASRC", 1, RT5677_ASRC_2, 11, 0, NULL,
 +		0),
 +	SND_SOC_DAPM_SUPPLY_S("DMIC STO2 ASRC", 1, RT5677_ASRC_2, 10, 0, NULL,
 +		0),
 +	SND_SOC_DAPM_SUPPLY_S("DMIC STO3 ASRC", 1, RT5677_ASRC_2, 9, 0, NULL,
 +		0),
 +	SND_SOC_DAPM_SUPPLY_S("DMIC STO4 ASRC", 1, RT5677_ASRC_2, 8, 0, NULL,
 +		0),
 +	SND_SOC_DAPM_SUPPLY_S("DMIC MONO L ASRC", 1, RT5677_ASRC_2, 7, 0, NULL,
 +		0),
 +	SND_SOC_DAPM_SUPPLY_S("DMIC MONO R ASRC", 1, RT5677_ASRC_2, 6, 0, NULL,
 +		0),
 +	SND_SOC_DAPM_SUPPLY_S("ADC STO1 ASRC", 1, RT5677_ASRC_2, 5, 0, NULL, 0),
 +	SND_SOC_DAPM_SUPPLY_S("ADC STO2 ASRC", 1, RT5677_ASRC_2, 4, 0, NULL, 0),
 +	SND_SOC_DAPM_SUPPLY_S("ADC STO3 ASRC", 1, RT5677_ASRC_2, 3, 0, NULL, 0),
 +	SND_SOC_DAPM_SUPPLY_S("ADC STO4 ASRC", 1, RT5677_ASRC_2, 2, 0, NULL, 0),
 +	SND_SOC_DAPM_SUPPLY_S("ADC MONO L ASRC", 1, RT5677_ASRC_2, 1, 0, NULL,
 +		0),
 +	SND_SOC_DAPM_SUPPLY_S("ADC MONO R ASRC", 1, RT5677_ASRC_2, 0, 0, NULL,
 +		0),
 +
  	/* Input Side */
  	/* micbias */
  	SND_SOC_DAPM_SUPPLY("MICBIAS1", RT5677_PWR_ANLG2, RT5677_PWR_MB1_BIT,