ASoC: wm8994: Add debounce to wm8994 mic detection
Subsystems (3)
PATCH 1/2 ASoC: wm8994: Add debounce to wm8994 mic detection
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8994.c | 27 ++++++++++++++++++++------- sound/soc/codecs/wm8994.h | 2 ++ 2 files changed, 22 insertions(+), 7 deletions(-)
sound/soc/codecs/wm8994.c +20 -7
@@ -3227,22 +3227,20 @@ int wm8994_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, }EXPORT_SYMBOL_GPL (wm8994_mic_detect); -static irqreturn_t wm8994_mic_irq (int irq,void *data) +static void wm8994_mic_work (struct work_struct *work) { -struct wm8994_priv *priv = data; +struct wm8994_priv *priv =container_of (work, + struct wm8994_priv, + mic_work.work);struct snd_soc_codec *codec = priv->codec;int reg;int report; -#ifndef CONFIG_SND_SOC_WM8994_MODULE -trace_snd_soc_jack_irq (dev_name (codec->dev)); -#endif - reg =snd_soc_read (codec,WM8994_INTERRUPT_RAW_STATUS_2 );if (reg <0 ) {dev_err (codec->dev,"Failed to read microphone status: %d\n" , reg); -return IRQ_HANDLED ; +return ; }dev_dbg (codec->dev,"Microphone status: %x\n" , reg);
@@ -3284,6 +3282,20 @@ static irqreturn_t wm8994_mic_irq(int irq, void *data)snd_soc_jack_report (priv->micdet[1 ].jack, report,SND_JACK_HEADSET |SND_JACK_BTN_0 ); +} + +static irqreturn_t wm8994_mic_irq (int irq,void *data) +{ +struct wm8994_priv *priv = data; +struct snd_soc_codec *codec = priv->codec; + +#ifndef CONFIG_SND_SOC_WM8994_MODULE +trace_snd_soc_jack_irq (dev_name (codec->dev)); +#endif + +pm_wakeup_event (codec->dev,300 ); + +schedule_delayed_work (&priv->mic_work,msecs_to_jiffies (250 ));return IRQ_HANDLED ; }
@@ -3656,6 +3668,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) wm8994->codec = codec;mutex_init (&wm8994->accdet_lock); +INIT_DELAYED_WORK (&wm8994->mic_work, wm8994_mic_work);for (i =0 ; i <ARRAY_SIZE (wm8994->fll_locked); i++)init_completion (&wm8994->fll_locked[i]);
sound/soc/codecs/wm8994.h +2 -0
@@ -12,6 +12,7 @@#include <sound/soc.h> #include <linux/firmware.h> #include <linux/completion.h> +#include <linux/workqueue.h> #include "wm_hubs.h"
@@ -127,6 +128,7 @@ struct wm8994_priv {struct mutex accdet_lock;struct wm8994_micdet micdet[2 ]; +struct delayed_work mic_work;bool mic_detecting;bool jack_mic;int btn_mask;
Signature · 1 line
1.7.10
PATCH 2/2 ASoC: wm8994: Use regmap directly for wm8994_mic_work
Make it clearer what context we're operating in.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8994.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
sound/soc/codecs/wm8994.c +9 -7
@@ -3232,18 +3232,20 @@ static void wm8994_mic_work(struct work_struct *work)struct wm8994_priv *priv =container_of (work, struct wm8994_priv, mic_work.work); -struct snd_soc_codec *codec = priv->codec; -int reg; +struct regmap *regmap = priv->wm8994->regmap; +struct device *dev = priv->wm8994->dev; +unsigned int reg; +int ret;int report; - reg =snd_soc_read (codec,WM8994_INTERRUPT_RAW_STATUS_2 ); -if (reg <0 ) { -dev_err (codec->dev,"Failed to read microphone status: %d\n" , - reg); + ret =regmap_read (regmap,WM8994_INTERRUPT_RAW_STATUS_2 , ®); +if (ret <0 ) { +dev_err (dev,"Failed to read microphone status: %d\n" , + ret);return ; } -dev_dbg (codec->dev,"Microphone status: %x\n" , reg); +dev_dbg (dev,"Microphone status: %x\n" , reg); report =0 ;if (reg &WM8994_MIC1_DET_STS ) {
Signature · 1 line
1.7.10