Merge tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[deliverable/linux.git] / include / linux / mfd / arizona / pdata.h

diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h
index 8b1d1daaae16c27e59d037f46899a1f6c631acc4..96d64f2b8d781393b5566bf1bacf2a6a6b669e09 100644 (file)
--- a/include/linux/mfd/arizona/pdata.h
+++ b/include/linux/mfd/arizona/pdata.h
@@ -62,6 +62,8 @@
 
 #define ARIZONA_MAX_OUTPUT 6
 
+#define ARIZONA_MAX_AIF 3
+
 #define ARIZONA_HAP_ACT_ERM 0
 #define ARIZONA_HAP_ACT_LRA 2
 
@@ -96,9 +98,37 @@ struct arizona_pdata {
        /** Pin state for GPIO pins */
        int gpio_defaults[ARIZONA_MAX_GPIO];
 
+       /**
+        * Maximum number of channels clocks will be generated for,
+        * useful for systems where and I2S bus with multiple data
+        * lines is mastered.
+        */
+       int max_channels_clocked[ARIZONA_MAX_AIF];
+
+       /** GPIO5 is used for jack detection */
+       bool jd_gpio5;
+
+       /** Use the headphone detect circuit to identify the accessory */
+       bool hpdet_acc_id;
+
+       /** GPIO used for mic isolation with HPDET */
+       int hpdet_id_gpio;
+
        /** GPIO for mic detection polarity */
        int micd_pol_gpio;
 
+       /** Mic detect ramp rate */
+       int micd_bias_start_time;
+
+       /** Mic detect sample rate */
+       int micd_rate;
+
+       /** Mic detect debounce level */
+       int micd_dbtime;
+
+       /** Force MICBIAS on for mic detect */
+       bool micd_force_micbias;
+
        /** Headset polarity configurations */
        struct arizona_micd_config *micd_configs;
        int num_micd_configs;