2 files changed, 26 insertions, 1 deletions

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 08909ccd235b..a8768ea7571a 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -405,6 +405,8 @@ struct snd_soc_codec {
         short reg_cache_size;
         short reg_cache_step;
 
+        unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */
+
         /* dapm */
         u32 pop_time;
         struct list_head dapm_widgets;
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index d8e93749321e..6c3351095786 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -1012,13 +1012,28 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event)
                         sys_power = 0;
                         break;
                 case SND_SOC_DAPM_STREAM_NOP:
-                        sys_power = codec->bias_level != SND_SOC_BIAS_STANDBY;
+                        switch (codec->bias_level) {
+                                case SND_SOC_BIAS_STANDBY:
+                                case SND_SOC_BIAS_OFF:
+                                        sys_power = 0;
+                                        break;
+                                default:
+                                        sys_power = 1;
+                                        break;
+                        }
                         break;
                 default:
                         break;
                 }
         }
 
+        if (sys_power && codec->bias_level == SND_SOC_BIAS_OFF) {
+                ret = snd_soc_dapm_set_bias_level(socdev,
+                                                  SND_SOC_BIAS_STANDBY);
+                if (ret != 0)
+                        pr_err("Failed to turn on bias: %d\n", ret);
+        }
+
         /* If we're changing to all on or all off then prepare */
         if ((sys_power && codec->bias_level == SND_SOC_BIAS_STANDBY) ||
             (!sys_power && codec->bias_level == SND_SOC_BIAS_ON)) {
@@ -1042,6 +1057,14 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event)
                         pr_err("Failed to apply standby bias: %d\n", ret);
         }
 
+        /* If we're in standby and can support bias off then do that */
+        if (codec->bias_level == SND_SOC_BIAS_STANDBY &&
+            codec->idle_bias_off) {
+                ret = snd_soc_dapm_set_bias_level(socdev, SND_SOC_BIAS_OFF);
+                if (ret != 0)
+                        pr_err("Failed to turn off bias: %d\n", ret);
+        }
+
         /* If we just powered up then move to active bias */
         if (codec->bias_level == SND_SOC_BIAS_PREPARE && sys_power) {
                 ret = snd_soc_dapm_set_bias_level(socdev,