openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'for-2.6.32' into for-2.6.33

This commit is contained in:
Mark Brown 2009-10-08 10:45:09 +01:00
parent 907bc6c7fc 6f775ba015
commit b727916a1f
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/codecs/wm8350.c
View File

@ -579,7 +579,7 @@ static const struct snd_kcontrol_new wm8350_left_capt_mixer_controls[] = {
SOC_DAPM_SINGLE_TLV("L3 Capture Volume", SOC_DAPM_SINGLE_TLV("L3 Capture Volume",
WM8350_INPUT_MIXER_VOLUME_L, 9, 7, 0, out_mix_tlv), WM8350_INPUT_MIXER_VOLUME_L, 9, 7, 0, out_mix_tlv),
SOC_DAPM_SINGLE("PGA Capture Switch", SOC_DAPM_SINGLE("PGA Capture Switch",
WM8350_LEFT_INPUT_VOLUME, 14, 1, 0), WM8350_LEFT_INPUT_VOLUME, 14, 1, 1),
}; };
/* Right Input Mixer */ /* 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", SOC_DAPM_SINGLE_TLV("L3 Capture Volume",
WM8350_INPUT_MIXER_VOLUME_R, 13, 7, 0, out_mix_tlv), WM8350_INPUT_MIXER_VOLUME_R, 13, 7, 0, out_mix_tlv),
SOC_DAPM_SINGLE("PGA Capture Switch", SOC_DAPM_SINGLE("PGA Capture Switch",
WM8350_RIGHT_INPUT_VOLUME, 14, 1, 0), WM8350_RIGHT_INPUT_VOLUME, 14, 1, 1),
}; };
/* Left Mic Mixer */ /* Left Mic Mixer */

8
sound/soc/imx/mxc-ssi.c
View File

@ -397,14 +397,6 @@ static int imx_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai,
break; 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) { if (cpu_dai->id == IMX_DAI_SSI0 || cpu_dai->id == IMX_DAI_SSI2) {
SSI1_STCR = stcr; SSI1_STCR = stcr;
SSI1_SRCR = srcr; SSI1_SRCR = srcr;