summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorTimur Tabi <timur@freescale.com>2008-08-07 11:22:32 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2008-10-30 15:54:11 +0000
commit0c235d1e837c142b7565814318b6ba5917d5ac32 (patch)
tree5b9d136a7840ffeb91022fbb7c70de9d7b0a1d17 /sound/soc/codecs
parentca53fb24dd21bff32c4b41b2be1035a1adfc0135 (diff)
downloadlinux-0c235d1e837c142b7565814318b6ba5917d5ac32.tar.gz
linux-0c235d1e837c142b7565814318b6ba5917d5ac32.tar.bz2
linux-0c235d1e837c142b7565814318b6ba5917d5ac32.zip
ASoC: Disable automatic volume control in the CS4270 sound driver
Disable the automatic volume control feature of the CS4270 audio codec. This feature, which is enabled by default, causes volume change commands to be delayed. Sometimes the volume change happens after playback is started. Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/cs4270.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
index 0bbd94501d7e..0ff476d7057c 100644
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
@@ -450,6 +450,19 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream,
return ret;
}
+ /* Disable automatic volume control. It's enabled by default, and
+ * it causes volume change commands to be delayed, sometimes until
+ * after playback has started.
+ */
+
+ reg = cs4270_read_reg_cache(codec, CS4270_TRANS);
+ reg &= ~(CS4270_TRANS_SOFT | CS4270_TRANS_ZERO);
+ ret = cs4270_i2c_write(codec, CS4270_TRANS, reg);
+ if (ret < 0) {
+ printk(KERN_ERR "I2C write failed\n");
+ return ret;
+ }
+
/* Thaw and power-up the codec */
ret = snd_soc_write(codec, CS4270_PWRCTL, 0);