Merge branch 'topic/asoc' into for-linus

Conflicts:
	sound/soc/codecs/ad1938.c

1 files changed, 96 insertions, 121 deletions

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 7c28f401f436..03cb7c05ebec 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -98,7 +98,6 @@ static void pop_dbg(u32 pop_time, const char *fmt, ...)
 
         if (pop_time) {
                 vprintk(fmt, args);
-                pop_wait(pop_time);
         }
 
         va_end(args);
@@ -315,62 +314,14 @@ static int dapm_update_bits(struct snd_soc_dapm_widget *widget)
                 pop_dbg(codec->pop_time, "pop test %s : %s in %d ms\n",
                         widget->name, widget->power ? "on" : "off",
                         codec->pop_time);
-                snd_soc_write(codec, widget->reg, new);
                 pop_wait(codec->pop_time);
+                snd_soc_write(codec, widget->reg, new);
         }
         pr_debug("reg %x old %x new %x change %d\n", widget->reg,
                  old, new, change);
         return change;
 }
 
-/* ramps the volume up or down to minimise pops before or after a
- * DAPM power event */
-static int dapm_set_pga(struct snd_soc_dapm_widget *widget, int power)
-{
-        const struct snd_kcontrol_new *k = widget->kcontrols;
-
-        if (widget->muted && !power)
-                return 0;
-        if (!widget->muted && power)
-                return 0;
-
-        if (widget->num_kcontrols && k) {
-                struct soc_mixer_control *mc =
-                        (struct soc_mixer_control *)k->private_value;
-                unsigned int reg = mc->reg;
-                unsigned int shift = mc->shift;
-                int max = mc->max;
-                unsigned int mask = (1 << fls(max)) - 1;
-                unsigned int invert = mc->invert;
-
-                if (power) {
-                        int i;
-                        /* power up has happended, increase volume to last level */
-                        if (invert) {
-                                for (i = max; i > widget->saved_value; i--)
-                                        snd_soc_update_bits(widget->codec, reg, mask, i);
-                        } else {
-                                for (i = 0; i < widget->saved_value; i++)
-                                        snd_soc_update_bits(widget->codec, reg, mask, i);
-                        }
-                        widget->muted = 0;
-                } else {
-                        /* power down is about to occur, decrease volume to mute */
-                        int val = snd_soc_read(widget->codec, reg);
-                        int i = widget->saved_value = (val >> shift) & mask;
-                        if (invert) {
-                                for (; i < mask; i++)
-                                        snd_soc_update_bits(widget->codec, reg, mask, i);
-                        } else {
-                                for (; i > 0; i--)
-                                        snd_soc_update_bits(widget->codec, reg, mask, i);
-                        }
-                        widget->muted = 1;
-                }
-        }
-        return 0;
-}
-
 /* create new dapm mixer control */
 static int dapm_new_mixer(struct snd_soc_codec *codec,
         struct snd_soc_dapm_widget *w)
@@ -465,20 +416,10 @@ err:
 static int dapm_new_pga(struct snd_soc_codec *codec,
         struct snd_soc_dapm_widget *w)
 {
-        struct snd_kcontrol *kcontrol;
-        int ret = 0;
-
-        if (!w->num_kcontrols)
-                return -EINVAL;
+        if (w->num_kcontrols)
+                pr_err("asoc: PGA controls not supported: '%s'\n", w->name);
 
-        kcontrol = snd_soc_cnew(&w->kcontrols[0], w, w->name);
-        ret = snd_ctl_add(codec->card, kcontrol);
-        if (ret < 0) {
-                printk(KERN_ERR "asoc: failed to add kcontrol %s\n", w->name);
-                return ret;
-        }
-
-        return ret;
+        return 0;
 }
 
 /* reset 'walked' bit for each dapm path */
@@ -490,6 +431,25 @@ static inline void dapm_clear_walk(struct snd_soc_codec *codec)
                 p->walked = 0;
 }
 
+/* We implement power down on suspend by checking the power state of
+ * the ALSA card - when we are suspending the ALSA state for the card
+ * is set to D3.
+ */
+static int snd_soc_dapm_suspend_check(struct snd_soc_dapm_widget *widget)
+{
+        struct snd_soc_codec *codec = widget->codec;
+
+        switch (snd_power_get_state(codec->card)) {
+        case SNDRV_CTL_POWER_D3hot:
+        case SNDRV_CTL_POWER_D3cold:
+                if (widget->ignore_suspend)
+                        pr_debug("%s ignoring suspend\n", widget->name);
+                return widget->ignore_suspend;
+        default:
+                return 1;
+        }
+}
+
 /*
  * Recursively check for a completed path to an active or physically connected
  * output widget. Returns number of complete paths.
@@ -506,7 +466,7 @@ static int is_connected_output_ep(struct snd_soc_dapm_widget *widget)
         case snd_soc_dapm_adc:
         case snd_soc_dapm_aif_out:
                 if (widget->active)
-                        return 1;
+                        return snd_soc_dapm_suspend_check(widget);
         default:
                 break;
         }
@@ -514,12 +474,12 @@ static int is_connected_output_ep(struct snd_soc_dapm_widget *widget)
         if (widget->connected) {
                 /* connected pin ? */
                 if (widget->id == snd_soc_dapm_output && !widget->ext)
-                        return 1;
+                        return snd_soc_dapm_suspend_check(widget);
 
                 /* connected jack or spk ? */
                 if (widget->id == snd_soc_dapm_hp || widget->id == snd_soc_dapm_spk ||
                     (widget->id == snd_soc_dapm_line && !list_empty(&widget->sources)))
-                        return 1;
+                        return snd_soc_dapm_suspend_check(widget);
         }
 
         list_for_each_entry(path, &widget->sinks, list_source) {
@@ -552,7 +512,7 @@ static int is_connected_input_ep(struct snd_soc_dapm_widget *widget)
         case snd_soc_dapm_dac:
         case snd_soc_dapm_aif_in:
                 if (widget->active)
-                        return 1;
+                        return snd_soc_dapm_suspend_check(widget);
         default:
                 break;
         }
@@ -560,16 +520,16 @@ static int is_connected_input_ep(struct snd_soc_dapm_widget *widget)
         if (widget->connected) {
                 /* connected pin ? */
                 if (widget->id == snd_soc_dapm_input && !widget->ext)
-                        return 1;
+                        return snd_soc_dapm_suspend_check(widget);
 
                 /* connected VMID/Bias for lower pops */
                 if (widget->id == snd_soc_dapm_vmid)
-                        return 1;
+                        return snd_soc_dapm_suspend_check(widget);
 
                 /* connected jack ? */
                 if (widget->id == snd_soc_dapm_mic ||
                     (widget->id == snd_soc_dapm_line && !list_empty(&widget->sinks)))
-                        return 1;
+                        return snd_soc_dapm_suspend_check(widget);
         }
 
         list_for_each_entry(path, &widget->sources, list_sink) {
@@ -634,16 +594,8 @@ static int dapm_generic_apply_power(struct snd_soc_dapm_widget *w)
                         return ret;
         }
 
-        /* Lower PGA volume to reduce pops */
-        if (w->id == snd_soc_dapm_pga && !w->power)
-                dapm_set_pga(w, w->power);
-
         dapm_update_bits(w);
 
-        /* Raise PGA volume to reduce pops */
-        if (w->id == snd_soc_dapm_pga && w->power)
-                dapm_set_pga(w, w->power);
-
         /* power up post event */
         if (w->power && w->event &&
             (w->event_flags & SND_SOC_DAPM_POST_PMU)) {
@@ -810,10 +762,6 @@ static void dapm_seq_run_coalesced(struct snd_soc_codec *codec,
                                 pr_err("%s: pre event failed: %d\n",
                                        w->name, ret);
                 }
-
-                /* Lower PGA volume to reduce pops */
-                if (w->id == snd_soc_dapm_pga && !w->power)
-                        dapm_set_pga(w, w->power);
         }
 
         if (reg >= 0) {
@@ -825,10 +773,6 @@ static void dapm_seq_run_coalesced(struct snd_soc_codec *codec,
         }
 
         list_for_each_entry(w, pending, power_list) {
-                /* Raise PGA volume to reduce pops */
-                if (w->id == snd_soc_dapm_pga && w->power)
-                        dapm_set_pga(w, w->power);
-
                 /* power up post event */
                 if (w->power && w->event &&
                     (w->event_flags & SND_SOC_DAPM_POST_PMU)) {
@@ -973,19 +917,12 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event)
                         if (!w->power_check)
                                 continue;
 
-                        /* If we're suspending then pull down all the 
-                         * power. */
-                        switch (event) {
-                        case SND_SOC_DAPM_STREAM_SUSPEND:
-                                power = 0;
-                                break;
-
-                        default:
+                        if (!w->force)
                                 power = w->power_check(w);
-                                if (power)
-                                        sys_power = 1;
-                                break;
-                        }
+                        else
+                                power = 1;
+                        if (power)
+                                sys_power = 1;
 
                         if (w->power == power)
                                 continue;
@@ -1076,6 +1013,7 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event)
 
         pop_dbg(codec->pop_time, "DAPM sequencing finished, waiting %dms\n",
                 codec->pop_time);
+        pop_wait(codec->pop_time);
 
         return 0;
 }
@@ -1338,6 +1276,9 @@ static int snd_soc_dapm_set_pin(struct snd_soc_codec *codec,
                 if (!strcmp(w->name, pin)) {
                         pr_debug("dapm: %s: pin %s\n", codec->name, pin);
                         w->connected = status;
+                        /* Allow disabling of forced pins */
+                        if (status == 0)
+                                w->force = 0;
                         return 0;
                 }
         }
@@ -1594,12 +1535,6 @@ int snd_soc_dapm_get_volsw(struct snd_kcontrol *kcontrol,
         unsigned int invert = mc->invert;
         unsigned int mask = (1 << fls(max)) - 1;
 
-        /* return the saved value if we are powered down */
-        if (widget->id == snd_soc_dapm_pga && !widget->power) {
-                ucontrol->value.integer.value[0] = widget->saved_value;
-                return 0;
-        }
-
         ucontrol->value.integer.value[0] =
                 (snd_soc_read(widget->codec, reg) >> shift) & mask;
         if (shift != rshift)
@@ -1659,13 +1594,6 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol,
         mutex_lock(&widget->codec->mutex);
         widget->value = val;
 
-        /* save volume value if the widget is powered down */
-        if (widget->id == snd_soc_dapm_pga && !widget->power) {
-                widget->saved_value = val;
-                mutex_unlock(&widget->codec->mutex);
-                return 1;
-        }
-
         if (snd_soc_test_bits(widget->codec, reg, val_mask, val)) {
                 if (val)
                         /* new connection */
@@ -2094,18 +2022,8 @@ int snd_soc_dapm_stream_event(struct snd_soc_codec *codec,
                                 w->active = 0;
                                 break;
                         case SND_SOC_DAPM_STREAM_SUSPEND:
-                                if (w->active)
-                                        w->suspend = 1;
-                                w->active = 0;
-                                break;
                         case SND_SOC_DAPM_STREAM_RESUME:
-                                if (w->suspend) {
-                                        w->active = 1;
-                                        w->suspend = 0;
-                                }
-                                break;
                         case SND_SOC_DAPM_STREAM_PAUSE_PUSH:
-                                break;
                         case SND_SOC_DAPM_STREAM_PAUSE_RELEASE:
                                 break;
                         }
@@ -2135,6 +2053,36 @@ int snd_soc_dapm_enable_pin(struct snd_soc_codec *codec, const char *pin)
 EXPORT_SYMBOL_GPL(snd_soc_dapm_enable_pin);
 
 /**
+ * snd_soc_dapm_force_enable_pin - force a pin to be enabled
+ * @codec: SoC codec
+ * @pin: pin name
+ *
+ * Enables input/output pin regardless of any other state.  This is
+ * intended for use with microphone bias supplies used in microphone
+ * jack detection.
+ *
+ * NOTE: snd_soc_dapm_sync() needs to be called after this for DAPM to
+ * do any widget power switching.
+ */
+int snd_soc_dapm_force_enable_pin(struct snd_soc_codec *codec, const char *pin)
+{
+        struct snd_soc_dapm_widget *w;
+
+        list_for_each_entry(w, &codec->dapm_widgets, list) {
+                if (!strcmp(w->name, pin)) {
+                        pr_debug("dapm: %s: pin %s\n", codec->name, pin);
+                        w->connected = 1;
+                        w->force = 1;
+                        return 0;
+                }
+        }
+
+        pr_err("dapm: %s: configuring unknown pin %s\n", codec->name, pin);
+        return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(snd_soc_dapm_force_enable_pin);
+
+/**
  * snd_soc_dapm_disable_pin - disable pin.
  * @codec: SoC codec
  * @pin: pin name
@@ -2192,6 +2140,33 @@ int snd_soc_dapm_get_pin_status(struct snd_soc_codec *codec, const char *pin)
 EXPORT_SYMBOL_GPL(snd_soc_dapm_get_pin_status);
 
 /**
+ * snd_soc_dapm_ignore_suspend - ignore suspend status for DAPM endpoint
+ * @codec: audio codec
+ * @pin: audio signal pin endpoint (or start point)
+ *
+ * Mark the given endpoint or pin as ignoring suspend.  When the
+ * system is disabled a path between two endpoints flagged as ignoring
+ * suspend will not be disabled.  The path must already be enabled via
+ * normal means at suspend time, it will not be turned on if it was not
+ * already enabled.
+ */
+int snd_soc_dapm_ignore_suspend(struct snd_soc_codec *codec, const char *pin)
+{
+        struct snd_soc_dapm_widget *w;
+
+        list_for_each_entry(w, &codec->dapm_widgets, list) {
+                if (!strcmp(w->name, pin)) {
+                        w->ignore_suspend = 1;
+                        return 0;
+                }
+        }
+
+        pr_err("Unknown DAPM pin: %s\n", pin);
+        return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(snd_soc_dapm_ignore_suspend);
+
+/**
  * snd_soc_dapm_free - free dapm resources
  * @socdev: SoC device
  *