mfd: arizona: Support configuring MICBIASes into bypass mode

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

2 files changed, 12 insertions, 1 deletions

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 0962c558dc02..dd679e8601da 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -514,10 +514,16 @@ int arizona_dev_init(struct arizona *arizona)
         }
 
         for (i = 0; i < ARIZONA_MAX_MICBIAS; i++) {
-                if (!arizona->pdata.micbias[i].mV)
+                if (!arizona->pdata.micbias[i].mV &&
+                    !arizona->pdata.micbias[i].bypass)
                         continue;
 
+                /* Apply default for bypass mode */
+                if (!arizona->pdata.micbias[i].mV)
+                        arizona->pdata.micbias[i].mV = 2800;
+
                 val = (arizona->pdata.micbias[i].mV - 1500) / 100;
+
                 val <<= ARIZONA_MICB1_LVL_SHIFT;
 
                 if (arizona->pdata.micbias[i].ext_cap)
@@ -529,10 +535,14 @@ int arizona_dev_init(struct arizona *arizona)
                 if (arizona->pdata.micbias[i].fast_start)
                         val |= ARIZONA_MICB1_RATE;
 
+                if (arizona->pdata.micbias[i].bypass)
+                        val |= ARIZONA_MICB1_BYPASS;
+
                 regmap_update_bits(arizona->regmap,
                                    ARIZONA_MIC_BIAS_CTRL_1 + i,
                                    ARIZONA_MICB1_LVL_MASK |
                                    ARIZONA_MICB1_DISCH |
+                                   ARIZONA_MICB1_BYPASS |
                                    ARIZONA_MICB1_RATE, val);
         }
 
diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h
index 8755dd05ab78..554d903cdf41 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 {