Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (348 commits)
  ALSA: hda - Fix NULL-derefence with a single mic in STAC auto-mic detection
  ALSA: hda - Add missing NID 0x19 fixup for Sony VAIO
  ALSA: hda - Fix ALC275 enable hardware EQ for SONY VAIO
  ALSA: oxygen: fix Xonar DG input
  ALSA: hda - Fix EAPD on Lenovo NB ALC269 to low
  ALSA: hda - Fix missing EAPD for Acer 4930G
  ALSA: hda: Disable 4/6 channels on some NVIDIA GPUs.
  ALSA: hda - Add static_hdmi_pcm option to HDMI codec parser
  ALSA: hda - Don't refer ELD when unplugged
  ASoC: tpa6130a2: Fix compiler warning
  ASoC: tlv320dac33: Add DAPM selection for LOM invert
  ASoC: DMIC codec: Adding a generic DMIC codec
  ALSA: snd-usb-us122l: Fix missing NULL checks
  ALSA: snd-usb-us122l: Fix MIDI output
  ASoC: soc-cache: Fix invalid memory access during snd_soc_lzo_cache_sync()
  ASoC: Fix section mismatch in wm8995.c
  ALSA: oxygen: add S/PDIF source selection for Claro cards
  ALSA: oxygen: fix CD/MIDI for X-Meridian (2G)
  ASoC: fix migor audio build
  ALSA: include delay.h for msleep in Xonar DG support
  ...

1 files changed, 235 insertions, 0 deletions

diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h
new file mode 100644
index 000000000000..186e84db4b54
--- /dev/null
+++ b/include/trace/events/asoc.h
@@ -0,0 +1,235 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM asoc
+
+#if !defined(_TRACE_ASOC_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_ASOC_H
+
+#include <linux/ktime.h>
+#include <linux/tracepoint.h>
+
+struct snd_soc_jack;
+struct snd_soc_codec;
+struct snd_soc_card;
+struct snd_soc_dapm_widget;
+
+/*
+ * Log register events
+ */
+DECLARE_EVENT_CLASS(snd_soc_reg,
+
+        TP_PROTO(struct snd_soc_codec *codec, unsigned int reg,
+                 unsigned int val),
+
+        TP_ARGS(codec, reg, val),
+
+        TP_STRUCT__entry(
+                __string(       name,           codec->name     )
+                __field(        int,            id              )
+                __field(        unsigned int,   reg             )
+                __field(        unsigned int,   val             )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, codec->name);
+                __entry->id = codec->id;
+                __entry->reg = reg;
+                __entry->val = val;
+        ),
+
+        TP_printk("codec=%s.%d reg=%x val=%x", __get_str(name),
+                  (int)__entry->id, (unsigned int)__entry->reg,
+                  (unsigned int)__entry->val)
+);
+
+DEFINE_EVENT(snd_soc_reg, snd_soc_reg_write,
+
+        TP_PROTO(struct snd_soc_codec *codec, unsigned int reg,
+                 unsigned int val),
+
+        TP_ARGS(codec, reg, val)
+
+);
+
+DEFINE_EVENT(snd_soc_reg, snd_soc_reg_read,
+
+        TP_PROTO(struct snd_soc_codec *codec, unsigned int reg,
+                 unsigned int val),
+
+        TP_ARGS(codec, reg, val)
+
+);
+
+DECLARE_EVENT_CLASS(snd_soc_card,
+
+        TP_PROTO(struct snd_soc_card *card, int val),
+
+        TP_ARGS(card, val),
+
+        TP_STRUCT__entry(
+                __string(       name,           card->name      )
+                __field(        int,            val             )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, card->name);
+                __entry->val = val;
+        ),
+
+        TP_printk("card=%s val=%d", __get_str(name), (int)__entry->val)
+);
+
+DEFINE_EVENT(snd_soc_card, snd_soc_bias_level_start,
+
+        TP_PROTO(struct snd_soc_card *card, int val),
+
+        TP_ARGS(card, val)
+
+);
+
+DEFINE_EVENT(snd_soc_card, snd_soc_bias_level_done,
+
+        TP_PROTO(struct snd_soc_card *card, int val),
+
+        TP_ARGS(card, val)
+
+);
+
+DECLARE_EVENT_CLASS(snd_soc_dapm_basic,
+
+        TP_PROTO(struct snd_soc_card *card),
+
+        TP_ARGS(card),
+
+        TP_STRUCT__entry(
+                __string(       name,   card->name      )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, card->name);
+        ),
+
+        TP_printk("card=%s", __get_str(name))
+);
+
+DEFINE_EVENT(snd_soc_dapm_basic, snd_soc_dapm_start,
+
+        TP_PROTO(struct snd_soc_card *card),
+
+        TP_ARGS(card)
+
+);
+
+DEFINE_EVENT(snd_soc_dapm_basic, snd_soc_dapm_done,
+
+        TP_PROTO(struct snd_soc_card *card),
+
+        TP_ARGS(card)
+
+);
+
+DECLARE_EVENT_CLASS(snd_soc_dapm_widget,
+
+        TP_PROTO(struct snd_soc_dapm_widget *w, int val),
+
+        TP_ARGS(w, val),
+
+        TP_STRUCT__entry(
+                __string(       name,   w->name         )
+                __field(        int,    val             )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, w->name);
+                __entry->val = val;
+        ),
+
+        TP_printk("widget=%s val=%d", __get_str(name),
+                  (int)__entry->val)
+);
+
+DEFINE_EVENT(snd_soc_dapm_widget, snd_soc_dapm_widget_power,
+
+        TP_PROTO(struct snd_soc_dapm_widget *w, int val),
+
+        TP_ARGS(w, val)
+
+);
+
+DEFINE_EVENT(snd_soc_dapm_widget, snd_soc_dapm_widget_event_start,
+
+        TP_PROTO(struct snd_soc_dapm_widget *w, int val),
+
+        TP_ARGS(w, val)
+
+);
+
+DEFINE_EVENT(snd_soc_dapm_widget, snd_soc_dapm_widget_event_done,
+
+        TP_PROTO(struct snd_soc_dapm_widget *w, int val),
+
+        TP_ARGS(w, val)
+
+);
+
+TRACE_EVENT(snd_soc_jack_irq,
+
+        TP_PROTO(const char *name),
+
+        TP_ARGS(name),
+
+        TP_STRUCT__entry(
+                __string(       name,   name            )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, name);
+        ),
+
+        TP_printk("%s", __get_str(name))
+);
+
+TRACE_EVENT(snd_soc_jack_report,
+
+        TP_PROTO(struct snd_soc_jack *jack, int mask, int val),
+
+        TP_ARGS(jack, mask, val),
+
+        TP_STRUCT__entry(
+                __string(       name,           jack->jack->name        )
+                __field(        int,            mask                    )
+                __field(        int,            val                     )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, jack->jack->name);
+                __entry->mask = mask;
+                __entry->val = val;
+        ),
+
+        TP_printk("jack=%s %x/%x", __get_str(name), (int)__entry->val,
+                  (int)__entry->mask)
+);
+
+TRACE_EVENT(snd_soc_jack_notify,
+
+        TP_PROTO(struct snd_soc_jack *jack, int val),
+
+        TP_ARGS(jack, val),
+
+        TP_STRUCT__entry(
+                __string(       name,           jack->jack->name        )
+                __field(        int,            val                     )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, jack->jack->name);
+                __entry->val = val;
+        ),
+
+        TP_printk("jack=%s %x", __get_str(name), (int)__entry->val)
+);
+
+#endif /* _TRACE_ASOC_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>