Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Additional updates for v3.7

A couple more updates for 3.7, enhancements to the ux500 and wm2000
drivers, a new driver for DA9055 and the support for regulator bypass
mode.  With the exception of the DA9055 this has all had a chance to
soak in -next (the driver was added on Friday so should be in -next
today).

4 files changed, 28 insertions, 2 deletions

diff --git a/include/linux/mfd/abx500/ab8500-codec.h b/include/linux/mfd/abx500/ab8500-codec.h
index dc6529202cdd..d7079413def0 100644
--- a/include/linux/mfd/abx500/ab8500-codec.h
+++ b/include/linux/mfd/abx500/ab8500-codec.h
@@ -23,7 +23,8 @@ enum amic_type {
 /* Mic-biases */
 enum amic_micbias {
         AMIC_MICBIAS_VAMIC1,
-        AMIC_MICBIAS_VAMIC2
+        AMIC_MICBIAS_VAMIC2,
+        AMIC_MICBIAS_UNKNOWN
 };
 
 /* Bias-voltage */
@@ -31,7 +32,8 @@ enum ear_cm_voltage {
         EAR_CMV_0_95V,
         EAR_CMV_1_10V,
         EAR_CMV_1_27V,
-        EAR_CMV_1_58V
+        EAR_CMV_1_58V,
+        EAR_CMV_UNKNOWN
 };
 
 /* Analog microphone settings */
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index da339fd8c755..ea3e35816621 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -177,6 +177,8 @@ int regulator_set_mode(struct regulator *regulator, unsigned int mode);
 unsigned int regulator_get_mode(struct regulator *regulator);
 int regulator_set_optimum_mode(struct regulator *regulator, int load_uA);
 
+int regulator_allow_bypass(struct regulator *regulator, bool allow);
+
 /* regulator notifier block */
 int regulator_register_notifier(struct regulator *regulator,
                               struct notifier_block *nb);
@@ -328,6 +330,12 @@ static inline int regulator_set_optimum_mode(struct regulator *regulator,
         return REGULATOR_MODE_NORMAL;
 }
 
+static inline int regulator_allow_bypass(struct regulator *regulator,
+                                         bool allow)
+{
+        return 0;
+}
+
 static inline int regulator_register_notifier(struct regulator *regulator,
                               struct notifier_block *nb)
 {
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index bac4c871f3bd..7274a469e8d9 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -32,6 +32,8 @@ enum regulator_status {
         REGULATOR_STATUS_NORMAL,
         REGULATOR_STATUS_IDLE,
         REGULATOR_STATUS_STANDBY,
+        /* The regulator is enabled but not regulating */
+        REGULATOR_STATUS_BYPASS,
         /* in case that any other status doesn't apply */
         REGULATOR_STATUS_UNDEFINED,
 };
@@ -67,6 +69,9 @@ enum regulator_status {
  * @get_optimum_mode: Get the most efficient operating mode for the regulator
  *                    when running with the specified parameters.
  *
+ * @set_bypass: Set the regulator in bypass mode.
+ * @get_bypass: Get the regulator bypass mode state.
+ *
  * @enable_time: Time taken for the regulator voltage output voltage to
  *               stabilise after being enabled, in microseconds.
  * @set_ramp_delay: Set the ramp delay for the regulator. The driver should
@@ -133,6 +138,10 @@ struct regulator_ops {
         unsigned int (*get_optimum_mode) (struct regulator_dev *, int input_uV,
                                           int output_uV, int load_uA);
 
+        /* control and report on bypass mode */
+        int (*set_bypass)(struct regulator_dev *dev, bool enable);
+        int (*get_bypass)(struct regulator_dev *dev, bool *enable);
+
         /* the operations below are for configuration of regulator state when
          * its parent PMIC enters a global STANDBY/HIBERNATE state */
 
@@ -205,6 +214,8 @@ struct regulator_desc {
         unsigned int vsel_mask;
         unsigned int enable_reg;
         unsigned int enable_mask;
+        unsigned int bypass_reg;
+        unsigned int bypass_mask;
 
         unsigned int enable_time;
 };
@@ -253,6 +264,7 @@ struct regulator_dev {
         int exclusive;
         u32 use_count;
         u32 open_count;
+        u32 bypass_count;
 
         /* lists we belong to */
         struct list_head list; /* list of all regulators */
@@ -310,6 +322,8 @@ int regulator_disable_regmap(struct regulator_dev *rdev);
 int regulator_set_voltage_time_sel(struct regulator_dev *rdev,
                                    unsigned int old_selector,
                                    unsigned int new_selector);
+int regulator_set_bypass_regmap(struct regulator_dev *rdev, bool enable);
+int regulator_get_bypass_regmap(struct regulator_dev *rdev, bool *enable);
 
 void *regulator_get_init_drvdata(struct regulator_init_data *reg_init_data);
 
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h
index 40dd0a394cfa..36adbc82de6a 100644
--- a/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
@@ -32,6 +32,7 @@ struct regulator;
  *           board/machine.
  * STATUS:   Regulator can be enabled and disabled.
  * DRMS:     Dynamic Regulator Mode Switching is enabled for this regulator.
+ * BYPASS:   Regulator can be put into bypass mode
  */
 
 #define REGULATOR_CHANGE_VOLTAGE        0x1
@@ -39,6 +40,7 @@ struct regulator;
 #define REGULATOR_CHANGE_MODE           0x4
 #define REGULATOR_CHANGE_STATUS         0x8
 #define REGULATOR_CHANGE_DRMS           0x10
+#define REGULATOR_CHANGE_BYPASS         0x20
 
 /**
  * struct regulator_state - regulator state during low power system states