1 files changed, 27 insertions, 1 deletions

diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h
index 455c51d22d6b..80dead1f7100 100644
--- a/include/linux/mfd/arizona/pdata.h
+++ b/include/linux/mfd/arizona/pdata.h
@@ -78,6 +78,7 @@ struct arizona_micbias {
         unsigned int ext_cap:1;    /** External capacitor fitted */
         unsigned int discharge:1;  /** Actively discharge */
         unsigned int fast_start:1; /** Enable aggressive startup ramp rate */
+        unsigned int bypass:1;     /** Use bypass mode */
 };
 
 struct arizona_micd_config {
@@ -86,6 +87,11 @@ struct arizona_micd_config {
         bool gpio;
 };
 
+struct arizona_micd_range {
+        int max;  /** Ohms */
+        int key;  /** Key to report to input layer */
+};
+
 struct arizona_pdata {
         int reset;      /** GPIO controlling /RESET, if any */
         int ldoena;     /** GPIO controlling LODENA, if any */
@@ -99,7 +105,8 @@ struct arizona_pdata {
         /** If a direct 32kHz clock is provided on an MCLK specify it here */
         int clk32k_src;
 
-        bool irq_active_high; /** IRQ polarity */
+        /** Mode for primary IRQ (defaults to active low) */
+        unsigned int irq_flags;
 
         /* Base GPIO */
         int gpio_base;
@@ -117,12 +124,21 @@ struct arizona_pdata {
         /** GPIO5 is used for jack detection */
         bool jd_gpio5;
 
+        /** Internal pull on GPIO5 is disabled when used for jack detection */
+        bool jd_gpio5_nopull;
+
         /** Use the headphone detect circuit to identify the accessory */
         bool hpdet_acc_id;
 
+        /** Check for line output with HPDET method */
+        bool hpdet_acc_id_line;
+
         /** GPIO used for mic isolation with HPDET */
         int hpdet_id_gpio;
 
+        /** Extra debounce timeout used during initial mic detection (ms) */
+        int micd_detect_debounce;
+
         /** GPIO for mic detection polarity */
         int micd_pol_gpio;
 
@@ -135,9 +151,16 @@ struct arizona_pdata {
         /** Mic detect debounce level */
         int micd_dbtime;
 
+        /** Mic detect timeout (ms) */
+        int micd_timeout;
+
         /** Force MICBIAS on for mic detect */
         bool micd_force_micbias;
 
+        /** Mic detect level parameters */
+        const struct arizona_micd_range *micd_ranges;
+        int num_micd_ranges;
+
         /** Headset polarity configurations */
         struct arizona_micd_config *micd_configs;
         int num_micd_configs;
@@ -162,6 +185,9 @@ struct arizona_pdata {
 
         /** Haptic actuator type */
         unsigned int hap_act;
+
+        /** GPIO for primary IRQ (used for edge triggered emulation) */
+        int irq_gpio;
 };
 
 #endif