aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-05 07:53:08 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-22 06:09:05 -0500
commit1c9e9795b5e2348df619fd6010d7583dc9b8c811 (patch)
tree1692520a5957be4261e22ff923373d3e2fe9a6be /sound/soc/codecs
parent2bbb5d667958f20ef8e7f7b37f9acced6dac0b98 (diff)
ASoC: Add jack IRQ trace to 88pm860x driver
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/88pm860x-codec.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c
index 08e15dee9182..a34fb924e77b 100644
--- a/sound/soc/codecs/88pm860x-codec.c
+++ b/sound/soc/codecs/88pm860x-codec.c
@@ -22,6 +22,7 @@
22#include <sound/tlv.h> 22#include <sound/tlv.h>
23#include <sound/initval.h> 23#include <sound/initval.h>
24#include <sound/jack.h> 24#include <sound/jack.h>
25#include <trace/events/asoc.h>
25 26
26#include "88pm860x-codec.h" 27#include "88pm860x-codec.h"
27 28
@@ -1262,6 +1263,10 @@ static irqreturn_t pm860x_codec_handler(int irq, void *data)
1262 mask = pm860x->det.hs_shrt | pm860x->det.hook_det | pm860x->det.lo_shrt 1263 mask = pm860x->det.hs_shrt | pm860x->det.hook_det | pm860x->det.lo_shrt
1263 | pm860x->det.hp_det; 1264 | pm860x->det.hp_det;
1264 1265
1266 if (status & (HEADSET_STATUS | MIC_STATUS | SHORT_HS1 | SHORT_HS2 |
1267 SHORT_LO1 | SHORT_LO2))
1268 trace_snd_soc_jack_irq(dev_name(pm860x->codec->dev));
1269
1265 if ((pm860x->det.hp_det & SND_JACK_HEADPHONE) 1270 if ((pm860x->det.hp_det & SND_JACK_HEADPHONE)
1266 && (status & HEADSET_STATUS)) 1271 && (status & HEADSET_STATUS))
1267 report |= SND_JACK_HEADPHONE; 1272 report |= SND_JACK_HEADPHONE;