Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b727916a authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.32' into for-2.6.33

parents 907bc6c7 6f775ba0

sound/soc/codecs/wm8350.c

+2 −2
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ static const struct snd_kcontrol_new wm8350_left_capt_mixer_controls[] = { 
	SOC_DAPM_SINGLE_TLV("L3 Capture Volume",

			    WM8350_INPUT_MIXER_VOLUME_L, 9, 7, 0, out_mix_tlv),

	SOC_DAPM_SINGLE("PGA Capture Switch",

			WM8350_LEFT_INPUT_VOLUME, 14, 1, 0),

			WM8350_LEFT_INPUT_VOLUME, 14, 1, 1),

};



/* Right Input Mixer */
@@ -589,7 +589,7 @@ static const struct snd_kcontrol_new wm8350_right_capt_mixer_controls[] = { 
	SOC_DAPM_SINGLE_TLV("L3 Capture Volume",

			    WM8350_INPUT_MIXER_VOLUME_R, 13, 7, 0, out_mix_tlv),

	SOC_DAPM_SINGLE("PGA Capture Switch",

			WM8350_RIGHT_INPUT_VOLUME, 14, 1, 0),

			WM8350_RIGHT_INPUT_VOLUME, 14, 1, 1),

};



/* Left Mic Mixer */

sound/soc/imx/mxc-ssi.c

+0 −8
Original line number Diff line number Diff line
@@ -397,14 +397,6 @@ static int imx_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, 
		break;

	}



	/* sync */

	if (!(fmt & SND_SOC_DAIFMT_ASYNC))

		scr |= SSI_SCR_SYN;



	/* tdm - only for stereo atm */

	if (fmt & SND_SOC_DAIFMT_TDM)

		scr |= SSI_SCR_NET;



	if (cpu_dai->id == IMX_DAI_SSI0 || cpu_dai->id == IMX_DAI_SSI2) {

		SSI1_STCR = stcr;

		SSI1_SRCR = srcr;