Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuil...

[~andy/linux] / include / sound / wm8962.h

diff --git a/include/sound/wm8962.h b/include/sound/wm8962.h
index f70258e3471cffa26206f478ebe1c2bd1a7eae78..2b5306c503fbc66e97c22dd07bb089b27c9aad71 100644 (file)
--- a/include/sound/wm8962.h
+++ b/include/sound/wm8962.h
@@ -15,8 +15,17 @@
 #define WM8962_GPIO_SET 0x10000
 
 struct wm8962_pdata {
+       int gpio_base;
        u32 gpio_init[WM8962_MAX_GPIO];
 
+       /* Setup for microphone detection, raw value to be written to
+        * R48(0x30) - only microphone related bits will be updated.
+        * Detection may be enabled here for use with signals brought
+        * out on the GPIOs. */
+       u32 mic_cfg;
+
+       bool irq_active_low;
+
        bool spk_mono;   /* Speaker outputs tied together as mono */
 };