summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@nokia.com>2010-01-20 08:39:35 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-20 12:47:49 +0100
commit6cd6cede8c33364d8e1abb5ea35adf627e3781b0 (patch)
tree17e588f659be6801ef0299a1b7f18019bd6b956e
parentASoC: fix compile breakage - add a missing header include (diff)
downloadlinux-6cd6cede8c33364d8e1abb5ea35adf627e3781b0.tar.xz
linux-6cd6cede8c33364d8e1abb5ea35adf627e3781b0.zip
ASoC: tlv320dac33: BCLK divider fix
The BCLK divider was not configured in case of mode7. This leads to unpredictable behavior when switching between FIFO modes. Configure the BCLK divider depending on the fifo_mode (FIFO is in use, or FIFO bypass). Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/codecs/tlv320dac33.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c
index 65683aa3920c..e1aa66ff7f1c 100644
--- a/sound/soc/codecs/tlv320dac33.c
+++ b/sound/soc/codecs/tlv320dac33.c
@@ -845,11 +845,14 @@ static int dac33_prepare_chip(struct snd_pcm_substream *substream)
dac33_write(codec, DAC33_SER_AUDIOIF_CTRL_A, aictrl_a);
dac33_write(codec, DAC33_SER_AUDIOIF_CTRL_B, aictrl_b);
- switch (dac33->fifo_mode) {
- case DAC33_FIFO_MODE1:
- /* 20: BCLK divide ratio */
+ /* BCLK divide ratio */
+ if (dac33->fifo_mode)
dac33_write(codec, DAC33_SER_AUDIOIF_CTRL_C, 3);
+ else
+ dac33_write(codec, DAC33_SER_AUDIOIF_CTRL_C, 32);
+ switch (dac33->fifo_mode) {
+ case DAC33_FIFO_MODE1:
dac33_write16(codec, DAC33_ATHR_MSB,
DAC33_THRREG(dac33->alarm_threshold));
break;
@@ -864,8 +867,6 @@ static int dac33_prepare_chip(struct snd_pcm_substream *substream)
DAC33_THRREG(10));
break;
default:
- /* BYPASS mode */
- dac33_write(codec, DAC33_SER_AUDIOIF_CTRL_C, 32);
break;
}