summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-10 16:22:29 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-10 16:22:29 +0400
commit921c038d87bc02accc8c5904ae080d6b67567974 (patch)
treea53cf1e2980669e03f9a187552f640c4edc15d3f /sound/soc
parent28f2675db8908eeb211391ea4415785a9203b25d (diff)
parent0cc411b934c4317b363d1af993549f391852b980 (diff)
downloadlinux-921c038d87bc02accc8c5904ae080d6b67567974.tar.xz
Merge remote-tracking branch 'asoc/fix/wm2200' into tmp
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/wm2200.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c
index afcf31df77e0..e6cefe1ac677 100644
--- a/sound/soc/codecs/wm2200.c
+++ b/sound/soc/codecs/wm2200.c
@@ -1566,15 +1566,9 @@ static int wm2200_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
case SND_SOC_DAIFMT_DSP_A:
fmt_val = 0;
break;
- case SND_SOC_DAIFMT_DSP_B:
- fmt_val = 1;
- break;
case SND_SOC_DAIFMT_I2S:
fmt_val = 2;
break;
- case SND_SOC_DAIFMT_LEFT_J:
- fmt_val = 3;
- break;
default:
dev_err(codec->dev, "Unsupported DAI format %d\n",
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,
lrclk);
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;
}