aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/au1x
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-17 23:40:24 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-17 23:40:24 +0100
commit9745e824a81e54ef009500e120e35b68e387b941 (patch)
tree4d096a73b785863fc1f2a0fe49ba55a2e72b4c17 /sound/soc/au1x
parent1593d7dd8c7b939e31b9d637307b26ada3e3c514 (diff)
downloadkernel_samsung_espresso10-9745e824a81e54ef009500e120e35b68e387b941.zip
kernel_samsung_espresso10-9745e824a81e54ef009500e120e35b68e387b941.tar.gz
kernel_samsung_espresso10-9745e824a81e54ef009500e120e35b68e387b941.tar.bz2
ASoC: Support non-crystal master clocks for WM8731
Instead of unconditionally enabling the crystal oscillator on the WM8731 only enable it when explicitly selected via set_sysclk(), allowing machine drivers to specify that they drive a clock into MCLK alone. This avoids any conflicts between the oscillator and the external MCLK source and saves power for systems which do not need the oscillator. This should also deliver a small power saving on systems using the crystal since the oscillator will only be enabled when the ADC or DAC is active. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/au1x')
-rw-r--r--sound/soc/au1x/db1200.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/au1x/db1200.c b/sound/soc/au1x/db1200.c
index 8780c90..d8dc822 100644
--- a/sound/soc/au1x/db1200.c
+++ b/sound/soc/au1x/db1200.c
@@ -49,7 +49,7 @@ static int db1200_i2s_startup(struct snd_pcm_substream *substream)
int ret;
/* WM8731 has its own 12MHz crystal */
- snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK,
+ snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL,
12000000, SND_SOC_CLOCK_IN);
/* codec is bitclock and lrclk master */