* [PATCH] ASoC: Clear any outstanding WM8962 FLL lock completions before waiting
@ 2011-08-21 16:19 Mark Brown
2011-08-22 10:38 ` Liam Girdwood
0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2011-08-21 16:19 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, patches, Mark Brown
Ensure that we don't spuriously trigger early.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
sound/soc/codecs/wm8962.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index c9e07aa..d2db512 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -2356,6 +2356,8 @@ static int sysclk_event(struct snd_soc_dapm_widget *w,
switch (event) {
case SND_SOC_DAPM_PRE_PMU:
if (fll) {
+ try_wait_for_completion(&wm8962->fll_lock);
+
snd_soc_update_bits(codec, WM8962_FLL_CONTROL_1,
WM8962_FLL_ENA, WM8962_FLL_ENA);
if (wm8962->irq) {
@@ -3456,6 +3458,8 @@ static int wm8962_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
snd_soc_write(codec, WM8962_FLL_CONTROL_7, fll_div.lambda);
snd_soc_write(codec, WM8962_FLL_CONTROL_8, fll_div.n);
+ try_wait_for_completion(&wm8962->fll_lock);
+
snd_soc_update_bits(codec, WM8962_FLL_CONTROL_1,
WM8962_FLL_FRAC | WM8962_FLL_REFCLK_SRC_MASK |
WM8962_FLL_ENA, fll1);
--
1.7.5.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ASoC: Clear any outstanding WM8962 FLL lock completions before waiting
2011-08-21 16:19 [PATCH] ASoC: Clear any outstanding WM8962 FLL lock completions before waiting Mark Brown
@ 2011-08-22 10:38 ` Liam Girdwood
0 siblings, 0 replies; 2+ messages in thread
From: Liam Girdwood @ 2011-08-22 10:38 UTC (permalink / raw)
To: Mark Brown
Cc: alsa-devel@alsa-project.org, patches@opensource.wolfsonmicro.com,
Liam Girdwood
On 21/08/11 17:19, Mark Brown wrote:
> Ensure that we don't spuriously trigger early.
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
> sound/soc/codecs/wm8962.c | 4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
> index c9e07aa..d2db512 100644
> --- a/sound/soc/codecs/wm8962.c
> +++ b/sound/soc/codecs/wm8962.c
> @@ -2356,6 +2356,8 @@ static int sysclk_event(struct snd_soc_dapm_widget *w,
> switch (event) {
> case SND_SOC_DAPM_PRE_PMU:
> if (fll) {
> + try_wait_for_completion(&wm8962->fll_lock);
> +
> snd_soc_update_bits(codec, WM8962_FLL_CONTROL_1,
> WM8962_FLL_ENA, WM8962_FLL_ENA);
> if (wm8962->irq) {
> @@ -3456,6 +3458,8 @@ static int wm8962_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
> snd_soc_write(codec, WM8962_FLL_CONTROL_7, fll_div.lambda);
> snd_soc_write(codec, WM8962_FLL_CONTROL_8, fll_div.n);
>
> + try_wait_for_completion(&wm8962->fll_lock);
> +
> snd_soc_update_bits(codec, WM8962_FLL_CONTROL_1,
> WM8962_FLL_FRAC | WM8962_FLL_REFCLK_SRC_MASK |
> WM8962_FLL_ENA, fll1);
Acked-by: Liam Girdwood <lrg@ti.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-08-22 10:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-21 16:19 [PATCH] ASoC: Clear any outstanding WM8962 FLL lock completions before waiting Mark Brown
2011-08-22 10:38 ` Liam Girdwood
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.