dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'asoc/fix/wm2200' into tmp

This commit is contained in:
Mark Brown 2013-01-10 12:22:29 +00:00
parent 28f2675db8 0cc411b934
commit 921c038d87
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/codecs/wm2200.c
View File

@ -1566,15 +1566,9 @@ static int wm2200_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
case SND_SOC_DAIFMT_DSP_A: case SND_SOC_DAIFMT_DSP_A:
fmt_val = 0; fmt_val = 0;
break; break;
case SND_SOC_DAIFMT_DSP_B:
fmt_val = 1;
break;
case SND_SOC_DAIFMT_I2S: case SND_SOC_DAIFMT_I2S:
fmt_val = 2; fmt_val = 2;
break; break;
case SND_SOC_DAIFMT_LEFT_J:
fmt_val = 3;
break;
default: default:
dev_err(codec->dev, "Unsupported DAI format %d\n", dev_err(codec->dev, "Unsupported DAI format %d\n",
fmt & SND_SOC_DAIFMT_FORMAT_MASK); fmt & SND_SOC_DAIFMT_FORMAT_MASK);
@ -1626,7 +1620,7 @@ static int wm2200_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
WM2200_AIF1TX_LRCLK_MSTR | WM2200_AIF1TX_LRCLK_INV, WM2200_AIF1TX_LRCLK_MSTR | WM2200_AIF1TX_LRCLK_INV,
lrclk); lrclk);
snd_soc_update_bits(codec, WM2200_AUDIO_IF_1_5, snd_soc_update_bits(codec, WM2200_AUDIO_IF_1_5,
WM2200_AIF1_FMT_MASK << 1, fmt_val << 1); WM2200_AIF1_FMT_MASK, fmt_val);
return 0; return 0;
} }