These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / linux / mfd / arizona / pdata.h

diff --git a/kernel/include/linux/mfd/arizona/pdata.h b/kernel/include/linux/mfd/arizona/pdata.h
index 1789cb0..57b45ca 100644 (file)
--- a/kernel/include/linux/mfd/arizona/pdata.h
+++ b/kernel/include/linux/mfd/arizona/pdata.h
@@ -101,7 +101,7 @@ struct arizona_pdata {
         * useful for systems where and I2S bus with multiple data
         * lines is mastered.
         */
-       int max_channels_clocked[ARIZONA_MAX_AIF];
+       unsigned int max_channels_clocked[ARIZONA_MAX_AIF];
 
        /** GPIO5 is used for jack detection */
        bool jd_gpio5;
@@ -121,23 +121,29 @@ struct arizona_pdata {
        /** GPIO used for mic isolation with HPDET */
        int hpdet_id_gpio;
 
+       /** Channel to use for headphone detection */
+       unsigned int hpdet_channel;
+
+       /** Use software comparison to determine mic presence */
+       bool micd_software_compare;
+
        /** Extra debounce timeout used during initial mic detection (ms) */
-       int micd_detect_debounce;
+       unsigned int micd_detect_debounce;
 
        /** GPIO for mic detection polarity */
        int micd_pol_gpio;
 
        /** Mic detect ramp rate */
-       int micd_bias_start_time;
+       unsigned int micd_bias_start_time;
 
        /** Mic detect sample rate */
-       int micd_rate;
+       unsigned int micd_rate;
 
        /** Mic detect debounce level */
-       int micd_dbtime;
+       unsigned int micd_dbtime;
 
        /** Mic detect timeout (ms) */
-       int micd_timeout;
+       unsigned int micd_timeout;
 
        /** Force MICBIAS on for mic detect */
        bool micd_force_micbias;
@@ -156,7 +162,12 @@ struct arizona_pdata {
        /** MICBIAS configurations */
        struct arizona_micbias micbias[ARIZONA_MAX_MICBIAS];
 
-       /** Mode of input structures */
+       /**
+        * Mode of input structures
+        * One of the ARIZONA_INMODE_xxx values
+        * wm5102/wm5110/wm8280/wm8997: [0]=IN1 [1]=IN2 [2]=IN3 [3]=IN4
+        * wm8998: [0]=IN1A [1]=IN2A [2]=IN1B [3]=IN2B
+        */
        int inmode[ARIZONA_MAX_INPUT];
 
        /** Mode for outputs */
@@ -173,6 +184,9 @@ struct arizona_pdata {
 
        /** GPIO for primary IRQ (used for edge triggered emulation) */
        int irq_gpio;
+
+       /** General purpose switch control */
+       unsigned int gpsw;
 };
 
 #endif