Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[karo-tx-linux.git] / include / linux / mfd / wm8994 / pdata.h

diff --git a/include/linux/mfd/wm8994/pdata.h b/include/linux/mfd/wm8994/pdata.h
index 68e77659488950f69df451b04b065eee72c9d144..90c60524a496c71425a228794950861a1fcf7ae7 100644 (file)
--- a/include/linux/mfd/wm8994/pdata.h
+++ b/include/linux/mfd/wm8994/pdata.h
@@ -182,6 +182,11 @@ struct wm8994_pdata {
         */
        int micdet_delay;
 
+       /* Delay between microphone detect completing and reporting on
+        * insert (specified in ms)
+        */
+       int mic_id_delay;
+
        /* IRQ for microphone detection if brought out directly as a
         * signal.
         */
@@ -223,6 +228,11 @@ struct wm8994_pdata {
         * lines is mastered.
         */
        int max_channels_clocked[WM8994_NUM_AIF];
+
+       /**
+        * GPIO for the IRQ pin if host only supports edge triggering
+        */
+       int irq_gpio;
 };
 
 #endif