diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-17 23:40:24 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-18 16:52:56 +0100 |
| commit | e77125105bbfe71f325466cdf9a16e496c96ac7a (patch) | |
| tree | 6b9cb2ca6c6e72fce194dcd9b927ef45d3141294 /sound/soc/atmel | |
| parent | 720ffa4cf3f6b76c27737a9d57bd0e6cc6af1fba (diff) | |
| download | linux-3.10-e77125105bbfe71f325466cdf9a16e496c96ac7a.tar.gz linux-3.10-e77125105bbfe71f325466cdf9a16e496c96ac7a.tar.bz2 linux-3.10-e77125105bbfe71f325466cdf9a16e496c96ac7a.zip | |
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>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/atmel')
| -rw-r--r-- | sound/soc/atmel/sam9g20_wm8731.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index 66a6f187968..8399ac46cb3 100644 --- a/sound/soc/atmel/sam9g20_wm8731.c +++ b/sound/soc/atmel/sam9g20_wm8731.c @@ -146,7 +146,7 @@ static int at91sam9g20ek_wm8731_init(struct snd_soc_pcm_runtime *rtd) "at91sam9g20ek_wm8731 " ": at91sam9g20ek_wm8731_init() called\n"); - ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK, + ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL, MCLK_RATE, SND_SOC_CLOCK_IN); if (ret < 0) { printk(KERN_ERR "Failed to set WM8731 SYSCLK: %d\n", ret); |