---

yaml
---
r: 157503
b: refs/heads/master
c: 4f1c192
h: refs/heads/master
i:
  157501: 0e43a44
  157499: 25cecd9
  157495: c722ed6
  157487: 9ba82d0
  157471: 0494513
  157439: e056bfb
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81628103dd8527d99ea39b054a3f002d5859d7c3
+refs/heads/master: 4f1c1923851f9734c972812121e80a3b04ab3af4

trunk/sound/soc/soc-dapm.c

@@ -786,6 +786,10 @@ 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) {
@@ -797,6 +801,10 @@ 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)) {
@@ -886,8 +894,6 @@ static void dapm_seq_run(struct snd_soc_codec *codec, struct list_head *list,
 		case snd_soc_dapm_line:
 		case snd_soc_dapm_spk:
 			/* No register support currently */
-		case snd_soc_dapm_pga:
-			/* Don't coalsece these yet due to gain ramping */
 			ret = dapm_generic_apply_power(w);
 			break;