* [PATCH] ASoc: wm8731: fix wm8731_check_osc() connected condition
@ 2011-05-24 9:50 Nicolas Ferre
2011-05-25 11:15 ` Mark Brown
2011-05-25 15:01 ` Mark Brown
0 siblings, 2 replies; 4+ messages in thread
From: Nicolas Ferre @ 2011-05-24 9:50 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] ASoc: wm8731: fix wm8731_check_osc() connected condition
2011-05-24 9:50 [PATCH] ASoc: wm8731: fix wm8731_check_osc() connected condition Nicolas Ferre
@ 2011-05-25 11:15 ` Mark Brown
2011-05-25 12:11 ` Liam Girdwood
2011-05-25 15:01 ` Mark Brown
1 sibling, 1 reply; 4+ messages in thread
From: Mark Brown @ 2011-05-25 11:15 UTC (permalink / raw)
To: linux-arm-kernel
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
>
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH] ASoc: wm8731: fix wm8731_check_osc() connected condition
2011-05-25 11:15 ` Mark Brown
@ 2011-05-25 12:11 ` Liam Girdwood
0 siblings, 0 replies; 4+ messages in thread
From: Liam Girdwood @ 2011-05-25 12:11 UTC (permalink / raw)
To: linux-arm-kernel
On 25/05/11 12:15, Mark Brown wrote:
> 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.
>
Acked-by: Liam Girdwood <lrg@ti.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ASoc: wm8731: fix wm8731_check_osc() connected condition
2011-05-24 9:50 [PATCH] ASoc: wm8731: fix wm8731_check_osc() connected condition Nicolas Ferre
2011-05-25 11:15 ` Mark Brown
@ 2011-05-25 15:01 ` Mark Brown
1 sibling, 0 replies; 4+ messages in thread
From: Mark Brown @ 2011-05-25 15:01 UTC (permalink / raw)
To: linux-arm-kernel
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.
Appilied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-05-25 15:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-24 9:50 [PATCH] ASoc: wm8731: fix wm8731_check_osc() connected condition Nicolas Ferre
2011-05-25 11:15 ` Mark Brown
2011-05-25 12:11 ` Liam Girdwood
2011-05-25 15:01 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).