On Tue, May 24, 2011 at 11:50:57AM +0200, Nicolas Ferre wrote:

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

Adding Liam - Nicolas, please remember to CC all maintainers on patches.

---

sound/soc/codecs/wm8731.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 6dec7ce..2dc964b 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -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[] = {

1.7.3