Skip to content

Commit

Permalink
ASoC: Trace Wolfson jack detection IRQs
Browse files Browse the repository at this point in the history
Add jack detection interrupt trace to Wolfson CODEC drivers.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
  • Loading branch information
Mark Brown committed Dec 22, 2010
1 parent 6d3c26b commit 2bbb5d6
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 0 deletions.
5 changes: 5 additions & 0 deletions sound/soc/codecs/wm8350.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <sound/soc.h>
#include <sound/initval.h>
#include <sound/tlv.h>
#include <trace/events/asoc.h>

#include "wm8350.h"

Expand Down Expand Up @@ -1378,10 +1379,12 @@ static irqreturn_t wm8350_hp_jack_handler(int irq, void *data)

switch (irq - wm8350->irq_base) {
case WM8350_IRQ_CODEC_JCK_DET_L:
trace_snd_soc_jack_irq("WM8350 HPL");
jack = &priv->hpl;
break;

case WM8350_IRQ_CODEC_JCK_DET_R:
trace_snd_soc_jack_irq("WM8350 HPR");
jack = &priv->hpr;
break;

Expand Down Expand Up @@ -1456,6 +1459,8 @@ static irqreturn_t wm8350_mic_handler(int irq, void *data)
u16 reg;
int report = 0;

trace_snd_soc_jack_irq("WM8350 mic");

reg = wm8350_reg_read(wm8350, WM8350_JACK_PIN_STATUS);
if (reg & WM8350_JACK_MICSCD_LVL)
report |= priv->mic.short_report;
Expand Down
4 changes: 4 additions & 0 deletions sound/soc/codecs/wm8903.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include <sound/soc.h>
#include <sound/initval.h>
#include <sound/wm8903.h>
#include <trace/events/asoc.h>

#include "wm8903.h"

Expand Down Expand Up @@ -1533,6 +1534,9 @@ static irqreturn_t wm8903_irq(int irq, void *data)
mic_report = wm8903->mic_last_report;
int_pol = snd_soc_read(codec, WM8903_INTERRUPT_POLARITY_1);

if (int_val & (WM8903_MICSHRT_EINT | WM8903_MICDET_EINT))
trace_snd_soc_jack_irq(dev_name(codec->dev));

if (int_val & WM8903_MICSHRT_EINT) {
dev_dbg(codec->dev, "Microphone short (pol=%x)\n", int_pol);

Expand Down
3 changes: 3 additions & 0 deletions sound/soc/codecs/wm8962.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include <sound/initval.h>
#include <sound/tlv.h>
#include <sound/wm8962.h>
#include <trace/events/asoc.h>

#include "wm8962.h"

Expand Down Expand Up @@ -3353,6 +3354,8 @@ static irqreturn_t wm8962_irq(int irq, void *data)
if (active & (WM8962_MICSCD_EINT | WM8962_MICD_EINT)) {
dev_dbg(codec->dev, "Microphone event detected\n");

trace_snd_soc_jack_irq(dev_name(codec->dev));

pm_wakeup_event(codec->dev, 300);

schedule_delayed_work(&wm8962->mic_work,
Expand Down
5 changes: 5 additions & 0 deletions sound/soc/codecs/wm8994.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <sound/soc.h>
#include <sound/initval.h>
#include <sound/tlv.h>
#include <trace/events/asoc.h>

#include <linux/mfd/wm8994/core.h>
#include <linux/mfd/wm8994/registers.h>
Expand Down Expand Up @@ -2755,6 +2756,8 @@ static irqreturn_t wm8994_mic_irq(int irq, void *data)
int reg;
int report;

trace_snd_soc_jack_irq(dev_name(codec->dev));

reg = snd_soc_read(codec, WM8994_INTERRUPT_RAW_STATUS_2);
if (reg < 0) {
dev_err(codec->dev, "Failed to read microphone status: %d\n",
Expand Down Expand Up @@ -2901,6 +2904,8 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data)
goto out;
}

trace_snd_soc_jack_irq(dev_name(codec->dev));

if (wm8994->jack_cb)
wm8994->jack_cb(reg, wm8994->jack_cb_data);
else
Expand Down

0 comments on commit 2bbb5d6

Please sign in to comment.