]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
ASoC: wm8731: fix wm8731_check_osc() connected condition
authorNicolas Ferre <nicolas.ferre@atmel.com>
Tue, 24 May 2011 09:50:57 +0000 (11:50 +0200)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 26 May 2011 14:11:16 +0000 (22:11 +0800)
The crystal oscillator is only enabled if the WM8731_SYSCLK_XTAL master clock
is specified. Fix the connected() struct snd_soc_dapm_route function to take
this into account. Oscillator is not enabled on machine that need it otherwise.

Machine drivers have to make sure that they use the proper SYSCLK value.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm8731.c

index 6dec7cee2cb4bd5fcd0cda18c7b325284a2ae039..2dc964b55e4fa15ce23fec72fbc7c7925f8fbc1e 100644 (file)
@@ -198,7 +198,7 @@ static int wm8731_check_osc(struct snd_soc_dapm_widget *source,
 {
        struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(source->codec);
 
-       return wm8731->sysclk_type == WM8731_SYSCLK_MCLK;
+       return wm8731->sysclk_type == WM8731_SYSCLK_XTAL;
 }
 
 static const struct snd_soc_dapm_route wm8731_intercon[] = {