1 files changed, 12 insertions, 3 deletions

diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index af104acd75f..247a6a99feb 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -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>
@@ -869,15 +870,15 @@ SOC_SINGLE_TLV("SPKR DAC1 Volume", WM8994_SPKMIXR_ATTENUATION,
 
 SOC_SINGLE_TLV("AIF1DAC1 3D Stereo Volume", WM8994_AIF1_DAC1_FILTERS_2,
                10, 15, 0, wm8994_3d_tlv),
-SOC_SINGLE("AIF1DAC1 3D Stereo Switch", WM8994_AIF1_DAC2_FILTERS_2,
+SOC_SINGLE("AIF1DAC1 3D Stereo Switch", WM8994_AIF1_DAC1_FILTERS_2,
            8, 1, 0),
 SOC_SINGLE_TLV("AIF1DAC2 3D Stereo Volume", WM8994_AIF1_DAC2_FILTERS_2,
                10, 15, 0, wm8994_3d_tlv),
 SOC_SINGLE("AIF1DAC2 3D Stereo Switch", WM8994_AIF1_DAC2_FILTERS_2,
            8, 1, 0),
-SOC_SINGLE_TLV("AIF2DAC 3D Stereo Volume", WM8994_AIF1_DAC1_FILTERS_2,
+SOC_SINGLE_TLV("AIF2DAC 3D Stereo Volume", WM8994_AIF2_DAC_FILTERS_2,
                10, 15, 0, wm8994_3d_tlv),
-SOC_SINGLE("AIF2DAC 3D Stereo Switch", WM8994_AIF1_DAC2_FILTERS_2,
+SOC_SINGLE("AIF2DAC 3D Stereo Switch", WM8994_AIF2_DAC_FILTERS_2,
            8, 1, 0),
 };
 
@@ -2755,6 +2756,10 @@ static irqreturn_t wm8994_mic_irq(int irq, void *data)
         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",
@@ -2901,6 +2906,10 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data)
                 goto out;
         }
 
+#ifndef CONFIG_SND_SOC_WM8994_MODULE
+        trace_snd_soc_jack_irq(dev_name(codec->dev));
+#endif
+
         if (wm8994->jack_cb)
                 wm8994->jack_cb(reg, wm8994->jack_cb_data);
         else