UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: Support FLL lock interrupt on WM8962 

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
This commit is contained in:
Mark Brown 2011-04-25 17:53:43 +01:00
parent c5f336cc00
commit 3b8a6d80e5
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sound/soc/codecs/wm8962.c
View File

@ -58,6 +58,7 @@ struct wm8962_priv {
int bclk; /* Desired BCLK */ int bclk; /* Desired BCLK */
int lrclk; int lrclk;
struct completion fll_lock;
int fll_src; int fll_src;
int fll_fref; int fll_fref;
int fll_fout; int fll_fout;
@ -3178,6 +3179,7 @@ static int wm8962_set_fll(struct snd_soc_dai *dai, int fll_id, int source,
struct snd_soc_codec *codec = dai->codec; struct snd_soc_codec *codec = dai->codec;
struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec); struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec);
struct _fll_div fll_div; struct _fll_div fll_div;
unsigned long timeout;
int ret; int ret;
int fll1 = snd_soc_read(codec, WM8962_FLL_CONTROL_1) & WM8962_FLL_ENA; int fll1 = snd_soc_read(codec, WM8962_FLL_CONTROL_1) & WM8962_FLL_ENA;
@ -3244,6 +3246,11 @@ static int wm8962_set_fll(struct snd_soc_dai *dai, int fll_id, int source,
dev_dbg(codec->dev, "FLL configured for %dHz->%dHz\n", Fref, Fout); dev_dbg(codec->dev, "FLL configured for %dHz->%dHz\n", Fref, Fout);
/* This should be a massive overestimate */
timeout = msecs_to_jiffies(1);
wait_for_completion_timeout(&wm8962->fll_lock, timeout);
wm8962->fll_fref = Fref; wm8962->fll_fref = Fref;
wm8962->fll_fout = Fout; wm8962->fll_fout = Fout;
wm8962->fll_src = source; wm8962->fll_src = source;
@ -3340,6 +3347,11 @@ static irqreturn_t wm8962_irq(int irq, void *data)
active = snd_soc_read(codec, WM8962_INTERRUPT_STATUS_2); active = snd_soc_read(codec, WM8962_INTERRUPT_STATUS_2);
active &= ~mask; active &= ~mask;
if (active & WM8962_FLL_LOCK_EINT) {
dev_dbg(codec->dev, "FLL locked\n");
complete(&wm8962->fll_lock);
}
if (active & WM8962_FIFOS_ERR_EINT) if (active & WM8962_FIFOS_ERR_EINT)
dev_err(codec->dev, "FIFO error\n"); dev_err(codec->dev, "FIFO error\n");
@ -3712,6 +3724,7 @@ static int wm8962_probe(struct snd_soc_codec *codec)
wm8962->codec = codec; wm8962->codec = codec;
INIT_DELAYED_WORK(&wm8962->mic_work, wm8962_mic_work); INIT_DELAYED_WORK(&wm8962->mic_work, wm8962_mic_work);
init_completion(&wm8962->fll_lock);
codec->cache_sync = 1; codec->cache_sync = 1;
codec->dapm.idle_bias_off = 1; codec->dapm.idle_bias_off = 1;
@ -3868,9 +3881,10 @@ static int wm8962_probe(struct snd_soc_codec *codec)
i2c->irq, ret); i2c->irq, ret);
/* Non-fatal */ /* Non-fatal */
} else { } else {
/* Enable error reporting IRQs by default */ /* Enable some IRQs by default */
snd_soc_update_bits(codec, snd_soc_update_bits(codec,
WM8962_INTERRUPT_STATUS_2_MASK, WM8962_INTERRUPT_STATUS_2_MASK,
WM8962_FLL_LOCK_EINT |
WM8962_TEMP_SHUT_EINT | WM8962_TEMP_SHUT_EINT |
WM8962_FIFOS_ERR_EINT, 0); WM8962_FIFOS_ERR_EINT, 0);
} }