aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-10 07:22:29 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-10 07:22:29 -0500
commit921c038d87bc02accc8c5904ae080d6b67567974 (patch)
treea53cf1e2980669e03f9a187552f640c4edc15d3f
parent28f2675db8908eeb211391ea4415785a9203b25d (diff)
parent0cc411b934c4317b363d1af993549f391852b980 (diff)
Merge remote-tracking branch 'asoc/fix/wm2200' into tmp
-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)
1566 case SND_SOC_DAIFMT_DSP_A: 1566 case SND_SOC_DAIFMT_DSP_A:
1567 fmt_val = 0; 1567 fmt_val = 0;
1568 break; 1568 break;
1569 case SND_SOC_DAIFMT_DSP_B:
1570 fmt_val = 1;
1571 break;
1572 case SND_SOC_DAIFMT_I2S: 1569 case SND_SOC_DAIFMT_I2S:
1573 fmt_val = 2; 1570 fmt_val = 2;
1574 break; 1571 break;
1575 case SND_SOC_DAIFMT_LEFT_J:
1576 fmt_val = 3;
1577 break;
1578 default: 1572 default:
1579 dev_err(codec->dev, "Unsupported DAI format %d\n", 1573 dev_err(codec->dev, "Unsupported DAI format %d\n",
1580 fmt & SND_SOC_DAIFMT_FORMAT_MASK); 1574 fmt & SND_SOC_DAIFMT_FORMAT_MASK);
@@ -1626,7 +1620,7 @@ static int wm2200_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
1626 WM2200_AIF1TX_LRCLK_MSTR | WM2200_AIF1TX_LRCLK_INV, 1620 WM2200_AIF1TX_LRCLK_MSTR | WM2200_AIF1TX_LRCLK_INV,
1627 lrclk); 1621 lrclk);
1628 snd_soc_update_bits(codec, WM2200_AUDIO_IF_1_5, 1622 snd_soc_update_bits(codec, WM2200_AUDIO_IF_1_5,
1629 WM2200_AIF1_FMT_MASK << 1, fmt_val << 1); 1623 WM2200_AIF1_FMT_MASK, fmt_val);
1630 1624
1631 return 0; 1625 return 0;
1632} 1626}