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

[cascardo/linux.git] / include / sound / max98095.h

diff --git a/include/sound/max98095.h b/include/sound/max98095.h
index 7513a42..e87ae67 100644 (file)
--- a/include/sound/max98095.h
+++ b/include/sound/max98095.h
@@ -49,6 +49,18 @@ struct max98095_pdata {
         */
        unsigned int digmic_left_mode:1;
        unsigned int digmic_right_mode:1;
+
+       /* Pin5 is the mechanical method of sensing jack insertion
+        * but it is something that might not be supported.
+        * 0 = PIN5 not supported
+        * 1 = PIN5 supported
+        */
+       unsigned int jack_detect_pin5en:1;
+
+       /* Slew amount for jack detection. Calculated as 4 * (delay + 1).
+        * Default delay is 24 to get a time of 100ms.
+        */
+       unsigned int jack_detect_delay;
 };
 
 #endif