summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorGrazvydas Ignotas <notasas@gmail.com>2008-11-05 22:51:05 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2008-11-06 12:27:30 +0100
commite18c94d20224f3df584531a48d944d8cccfda46d (patch)
treede5c5bee6ca3cdf5bf75c4f08b491c6ef83de309 /sound/soc/codecs
parentASoC: Add new parameter to s3c24xx_pcm_enqueue (diff)
downloadlinux-e18c94d20224f3df584531a48d944d8cccfda46d.tar.xz
linux-e18c94d20224f3df584531a48d944d8cccfda46d.zip
ALSA: ASoC: TWL4030 codec - fix 256*Fs clock
According to TRM, 256*Fs clock output should be enabled when TWL4030 is in slave mode, not master. This allows sound to work on OMAP3 Pandora, which uses 256*Fs clock. Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> Acked-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/twl4030.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index ee2f0d37765c..90f3b4decbab 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -469,11 +469,11 @@ static int twl4030_set_dai_fmt(struct snd_soc_dai *codec_dai,
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
case SND_SOC_DAIFMT_CBM_CFM:
format &= ~(TWL4030_AIF_SLAVE_EN);
- format |= TWL4030_CLK256FS_EN;
+ format &= ~(TWL4030_CLK256FS_EN);
break;
case SND_SOC_DAIFMT_CBS_CFS:
- format &= ~(TWL4030_CLK256FS_EN);
format |= TWL4030_AIF_SLAVE_EN;
+ format |= TWL4030_CLK256FS_EN;
break;
default:
return -EINVAL;