Merge tag 'mfd-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

[~andy/linux] / include / linux / mfd / arizona / pdata.h

diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h
index 96d64f2b8d781393b5566bf1bacf2a6a6b669e09..455c51d22d6b43e5dd4ccb932021dfcea36182a0 100644 (file)
--- a/include/linux/mfd/arizona/pdata.h
+++ b/include/linux/mfd/arizona/pdata.h
@@ -56,6 +56,8 @@
 #define ARIZONA_DMIC_MICBIAS2 2
 #define ARIZONA_DMIC_MICBIAS3 3
 
+#define ARIZONA_MAX_MICBIAS 3
+
 #define ARIZONA_INMODE_DIFF 0
 #define ARIZONA_INMODE_SE   1
 #define ARIZONA_INMODE_DMIC 2
@@ -71,6 +73,13 @@
 
 struct regulator_init_data;
 
+struct arizona_micbias {
+       int mV;                    /** Regulated voltage */
+       unsigned int ext_cap:1;    /** External capacitor fitted */
+       unsigned int discharge:1;  /** Actively discharge */
+       unsigned int fast_start:1; /** Enable aggressive startup ramp rate */
+};
+
 struct arizona_micd_config {
        unsigned int src;
        unsigned int bias;
@@ -136,6 +145,9 @@ struct arizona_pdata {
        /** Reference voltage for DMIC inputs */
        int dmic_ref[ARIZONA_MAX_INPUT];
 
+       /** MICBIAS configurations */
+       struct arizona_micbias micbias[ARIZONA_MAX_MICBIAS];
+
        /** Mode of input structures */
        int inmode[ARIZONA_MAX_INPUT];