Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 054e1b48 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: arizona: Add delay for output disable 



Give the output disable sequence a chance to fully complete, otherwise
there is a danger we may remove the clock before it is finished
resulting in a pop noise. The delay for each output must be cumulative
and these are coalesced into a single delay.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a6b3db2c

sound/soc/codecs/arizona.c

+37 −0
Original line number Diff line number Diff line
@@ -734,6 +734,8 @@ int arizona_out_ev(struct snd_soc_dapm_widget *w, 
		   struct snd_kcontrol *kcontrol,

		   int event)

{

	struct arizona_priv *priv = snd_soc_codec_get_drvdata(w->codec);



	switch (event) {

	case SND_SOC_DAPM_POST_PMU:

		switch (w->shift) {
@@ -750,6 +752,39 @@ int arizona_out_ev(struct snd_soc_dapm_widget *w, 
			break;

		}

		break;

	case SND_SOC_DAPM_PRE_PMD:

		switch (w->shift) {

		case ARIZONA_OUT1L_ENA_SHIFT:

		case ARIZONA_OUT1R_ENA_SHIFT:

		case ARIZONA_OUT2L_ENA_SHIFT:

		case ARIZONA_OUT2R_ENA_SHIFT:

		case ARIZONA_OUT3L_ENA_SHIFT:

		case ARIZONA_OUT3R_ENA_SHIFT:

			priv->out_down_pending++;

			priv->out_down_delay++;

			break;

		default:

			break;

		}

		break;

	case SND_SOC_DAPM_POST_PMD:

		switch (w->shift) {

		case ARIZONA_OUT1L_ENA_SHIFT:

		case ARIZONA_OUT1R_ENA_SHIFT:

		case ARIZONA_OUT2L_ENA_SHIFT:

		case ARIZONA_OUT2R_ENA_SHIFT:

		case ARIZONA_OUT3L_ENA_SHIFT:

		case ARIZONA_OUT3R_ENA_SHIFT:

			priv->out_down_pending--;

			if (!priv->out_down_pending) {

				msleep(priv->out_down_delay);

				priv->out_down_delay = 0;

			}

			break;

		default:

			break;

		}

		break;

	}



	return 0;
@@ -772,6 +807,8 @@ int arizona_hp_ev(struct snd_soc_dapm_widget *w, 
	case SND_SOC_DAPM_PRE_PMD:

		val = 0;

		break;

	case SND_SOC_DAPM_POST_PMD:

		return arizona_out_ev(w, kcontrol, event);

	default:

		return -EINVAL;

	}

sound/soc/codecs/arizona.h

+3 −0
Original line number Diff line number Diff line
@@ -77,6 +77,9 @@ struct arizona_priv { 
	int num_inputs;

	unsigned int in_pending;



	unsigned int out_down_pending;

	unsigned int out_down_delay;



	unsigned int spk_ena:2;

	unsigned int spk_ena_pending:1;

};

sound/soc/codecs/wm5102.c

+10 −5
Original line number Diff line number Diff line
@@ -1272,19 +1272,24 @@ SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1, 


SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,

		   ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT1R", SND_SOC_NOPM,

		   ARIZONA_OUT1R_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT2L", ARIZONA_OUTPUT_ENABLES_1,

		   ARIZONA_OUT2L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT2R", ARIZONA_OUTPUT_ENABLES_1,

		   ARIZONA_OUT2R_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT3L", ARIZONA_OUTPUT_ENABLES_1,

		   ARIZONA_OUT3L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT5L", ARIZONA_OUTPUT_ENABLES_1,

		   ARIZONA_OUT5L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),

sound/soc/codecs/wm5110.c

+12 −6
Original line number Diff line number Diff line
@@ -905,22 +905,28 @@ SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 0, 


SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,

		   ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT1R", SND_SOC_NOPM,

		   ARIZONA_OUT1R_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT2L", ARIZONA_OUTPUT_ENABLES_1,

		   ARIZONA_OUT2L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT2R", ARIZONA_OUTPUT_ENABLES_1,

		   ARIZONA_OUT2R_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT3L", ARIZONA_OUTPUT_ENABLES_1,

		   ARIZONA_OUT3L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT3R", ARIZONA_OUTPUT_ENABLES_1,

		   ARIZONA_OUT3R_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT5L", ARIZONA_OUTPUT_ENABLES_1,

		   ARIZONA_OUT5L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),

sound/soc/codecs/wm8997.c

+6 −3
Original line number Diff line number Diff line
@@ -610,13 +610,16 @@ SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1, 


SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,

		   ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT1R", SND_SOC_NOPM,

		   ARIZONA_OUT1R_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT3L", ARIZONA_OUTPUT_ENABLES_1,

		   ARIZONA_OUT3L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT5L", ARIZONA_OUTPUT_ENABLES_1,

		   ARIZONA_OUT5L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),