From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754415Ab1EYLPf (ORCPT ); Wed, 25 May 2011 07:15:35 -0400 Received: from opensource.wolfsonmicro.com ([80.75.67.52]:55030 "EHLO opensource2.wolfsonmicro.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751454Ab1EYLPe (ORCPT ); Wed, 25 May 2011 07:15:34 -0400 Date: Wed, 25 May 2011 19:15:30 +0800 From: Mark Brown To: Nicolas Ferre Cc: linux-arm-kernel@lists.infradead.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, lrg@ti.com Subject: Re: [PATCH] ASoc: wm8731: fix wm8731_check_osc() connected condition Message-ID: <20110525111529.GC10797@opensource.wolfsonmicro.com> References: <1306230657-28649-1-git-send-email-nicolas.ferre@atmel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1306230657-28649-1-git-send-email-nicolas.ferre@atmel.com> X-Cookie: There is a 20% chance of tomorrow. User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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 >