Commit c7ebf932 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Use WM8994 FLL lock interrupt 



If we have interrupts then wait for the FLL lock interrupt rather than
using dead reckoning when waiting for the FLL to start.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent b30ead5f

sound/soc/codecs/wm8994.c

+39 −1
Original line number Diff line number Diff line
@@ -1635,6 +1635,7 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src, 
	int reg_offset, ret;

	struct fll_div fll;

	u16 reg, aif1, aif2;

	unsigned long timeout;



	aif1 = snd_soc_read(codec, WM8994_AIF1_CLOCKING_1)

		& WM8994_AIF1CLK_ENA;
@@ -1726,8 +1727,16 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src, 
				    WM8994_FLL1_ENA | WM8994_FLL1_FRAC,

				    reg);



		if (wm8994->fll_locked_irq) {

			timeout = wait_for_completion_timeout(&wm8994->fll_locked[id],

							      msecs_to_jiffies(10));

			if (timeout == 0)

				dev_warn(codec->dev,

					 "Timed out waiting for FLL lock\n");

		} else {

			msleep(5);

		}

	}



	wm8994->fll[id].in = freq_in;

	wm8994->fll[id].out = freq_out;
@@ -1744,6 +1753,14 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src, 
	return 0;

}



static irqreturn_t wm8994_fll_locked_irq(int irq, void *data)

{

	struct completion *completion = data;



	complete(completion);



	return IRQ_HANDLED;

}



static int opclk_divs[] = { 10, 20, 30, 40, 55, 60, 80, 120, 160 };
@@ -2879,6 +2896,9 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) 
	wm8994->pdata = dev_get_platdata(codec->dev->parent);

	wm8994->codec = codec;



	for (i = 0; i < ARRAY_SIZE(wm8994->fll_locked); i++)

		init_completion(&wm8994->fll_locked[i]);



	if (wm8994->pdata && wm8994->pdata->micdet_irq)

		wm8994->micdet_irq = wm8994->pdata->micdet_irq;

	else if (wm8994->pdata && wm8994->pdata->irq_base)
@@ -2994,6 +3014,16 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) 
		}

	}



	wm8994->fll_locked_irq = true;

	for (i = 0; i < ARRAY_SIZE(wm8994->fll_locked); i++) {

		ret = wm8994_request_irq(codec->control_data,

					 WM8994_IRQ_FLL1_LOCK + i,

					 wm8994_fll_locked_irq, "FLL lock",

					 &wm8994->fll_locked[i]);

		if (ret != 0)

			wm8994->fll_locked_irq = false;

	}



	/* Remember if AIFnLRCLK is configured as a GPIO.  This should be

	 * configured on init - if a system wants to do this dynamically

	 * at runtime we can deal with that then.
@@ -3179,6 +3209,9 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) 
	wm8994_free_irq(codec->control_data, WM8994_IRQ_MIC1_SHRT, wm8994);

	if (wm8994->micdet_irq)

		free_irq(wm8994->micdet_irq, wm8994);

	for (i = 0; i < ARRAY_SIZE(wm8994->fll_locked); i++)

		wm8994_free_irq(codec->control_data, WM8994_IRQ_FLL1_LOCK + i,

				&wm8994->fll_locked[i]);

	wm8994_free_irq(codec->control_data, WM8994_IRQ_DCS_DONE,

			&wm8994->hubs);

err:
@@ -3190,11 +3223,16 @@ static int wm8994_codec_remove(struct snd_soc_codec *codec) 
{

	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);

	struct wm8994 *control = codec->control_data;

	int i;



	wm8994_set_bias_level(codec, SND_SOC_BIAS_OFF);



	pm_runtime_disable(codec->dev);



	for (i = 0; i < ARRAY_SIZE(wm8994->fll_locked); i++)

		wm8994_free_irq(codec->control_data, WM8994_IRQ_FLL1_LOCK + i,

				&wm8994->fll_locked[i]);



	wm8994_free_irq(codec->control_data, WM8994_IRQ_DCS_DONE,

			&wm8994->hubs);

sound/soc/codecs/wm8994.h

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


#include <sound/soc.h>

#include <linux/firmware.h>

#include <linux/completion.h>



#include "wm_hubs.h"
@@ -79,6 +80,8 @@ struct wm8994_priv { 
	int mclk[2];

	int aifclk[2];

	struct wm8994_fll_config fll[2], fll_suspend[2];

	struct completion fll_locked[2];

	bool fll_locked_irq;



	int dac_rates[2];

	int lrclk_shared[2];