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

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

ASoC: arizona: Coalesce output power up delays 



Save a bit of scheduling by coalescing all the output power up delays
into a single delay.

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

sound/soc/codecs/arizona.c

+21 −1
Original line number Original line Diff line number Diff line
@@ -737,6 +737,21 @@ int arizona_out_ev(struct snd_soc_dapm_widget *w, 
	struct arizona_priv *priv = snd_soc_codec_get_drvdata(w->codec);

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





	switch (event) {

	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		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_up_pending++;

			priv->out_up_delay += 17;

			break;

		default:

			break;

		}

		break;

	case SND_SOC_DAPM_POST_PMU:

	case SND_SOC_DAPM_POST_PMU:

		switch (w->shift) {

		switch (w->shift) {

		case ARIZONA_OUT1L_ENA_SHIFT:

		case ARIZONA_OUT1L_ENA_SHIFT:
@@ -745,7 +760,11 @@ int arizona_out_ev(struct snd_soc_dapm_widget *w, 
		case ARIZONA_OUT2R_ENA_SHIFT:

		case ARIZONA_OUT2R_ENA_SHIFT:

		case ARIZONA_OUT3L_ENA_SHIFT:

		case ARIZONA_OUT3L_ENA_SHIFT:

		case ARIZONA_OUT3R_ENA_SHIFT:

		case ARIZONA_OUT3R_ENA_SHIFT:

			msleep(17);

			priv->out_up_pending--;

			if (!priv->out_up_pending) {

				msleep(priv->out_up_delay);

				priv->out_up_delay = 0;

			}

			break;

			break;





		default:

		default:
@@ -807,6 +826,7 @@ int arizona_hp_ev(struct snd_soc_dapm_widget *w, 
	case SND_SOC_DAPM_PRE_PMD:

	case SND_SOC_DAPM_PRE_PMD:

		val = 0;

		val = 0;

		break;

		break;

	case SND_SOC_DAPM_PRE_PMU:

	case SND_SOC_DAPM_POST_PMD:

	case SND_SOC_DAPM_POST_PMD:

		return arizona_out_ev(w, kcontrol, event);

		return arizona_out_ev(w, kcontrol, event);

	default:

	default:

sound/soc/codecs/arizona.h

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

	int num_inputs;

	unsigned int in_pending;

	unsigned int in_pending;





	unsigned int out_up_pending;

	unsigned int out_up_delay;

	unsigned int out_down_pending;

	unsigned int out_down_pending;

	unsigned int out_down_delay;

	unsigned int out_down_delay;

sound/soc/codecs/wm5102.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -1273,23 +1273,23 @@ SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1, 
SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,

SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,

		   ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,

		   ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT1R", SND_SOC_NOPM,

SND_SOC_DAPM_PGA_E("OUT1R", SND_SOC_NOPM,

		   ARIZONA_OUT1R_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,

		   ARIZONA_OUT1R_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT2L", ARIZONA_OUTPUT_ENABLES_1,

SND_SOC_DAPM_PGA_E("OUT2L", ARIZONA_OUTPUT_ENABLES_1,

		   ARIZONA_OUT2L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   ARIZONA_OUT2L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT2R", ARIZONA_OUTPUT_ENABLES_1,

SND_SOC_DAPM_PGA_E("OUT2R", ARIZONA_OUTPUT_ENABLES_1,

		   ARIZONA_OUT2R_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   ARIZONA_OUT2R_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT3L", ARIZONA_OUTPUT_ENABLES_1,

SND_SOC_DAPM_PGA_E("OUT3L", ARIZONA_OUTPUT_ENABLES_1,

		   ARIZONA_OUT3L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   ARIZONA_OUT3L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT5L", ARIZONA_OUTPUT_ENABLES_1,

SND_SOC_DAPM_PGA_E("OUT5L", ARIZONA_OUTPUT_ENABLES_1,

		   ARIZONA_OUT5L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   ARIZONA_OUT5L_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_PMU),

sound/soc/codecs/wm5110.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -906,27 +906,27 @@ SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 0, 
SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,

SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,

		   ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,

		   ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT1R", SND_SOC_NOPM,

SND_SOC_DAPM_PGA_E("OUT1R", SND_SOC_NOPM,

		   ARIZONA_OUT1R_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,

		   ARIZONA_OUT1R_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT2L", ARIZONA_OUTPUT_ENABLES_1,

SND_SOC_DAPM_PGA_E("OUT2L", ARIZONA_OUTPUT_ENABLES_1,

		   ARIZONA_OUT2L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   ARIZONA_OUT2L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT2R", ARIZONA_OUTPUT_ENABLES_1,

SND_SOC_DAPM_PGA_E("OUT2R", ARIZONA_OUTPUT_ENABLES_1,

		   ARIZONA_OUT2R_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   ARIZONA_OUT2R_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT3L", ARIZONA_OUTPUT_ENABLES_1,

SND_SOC_DAPM_PGA_E("OUT3L", ARIZONA_OUTPUT_ENABLES_1,

		   ARIZONA_OUT3L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   ARIZONA_OUT3L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT3R", ARIZONA_OUTPUT_ENABLES_1,

SND_SOC_DAPM_PGA_E("OUT3R", ARIZONA_OUTPUT_ENABLES_1,

		   ARIZONA_OUT3R_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   ARIZONA_OUT3R_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT5L", ARIZONA_OUTPUT_ENABLES_1,

SND_SOC_DAPM_PGA_E("OUT5L", ARIZONA_OUTPUT_ENABLES_1,

		   ARIZONA_OUT5L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   ARIZONA_OUT5L_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_PMU),

sound/soc/codecs/wm8997.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -611,15 +611,15 @@ SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1, 
SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,

SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,

		   ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,

		   ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT1R", SND_SOC_NOPM,

SND_SOC_DAPM_PGA_E("OUT1R", SND_SOC_NOPM,

		   ARIZONA_OUT1R_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,

		   ARIZONA_OUT1R_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT3L", ARIZONA_OUTPUT_ENABLES_1,

SND_SOC_DAPM_PGA_E("OUT3L", ARIZONA_OUTPUT_ENABLES_1,

		   ARIZONA_OUT3L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   ARIZONA_OUT3L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_POST_PMU),

		   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT5L", ARIZONA_OUTPUT_ENABLES_1,

SND_SOC_DAPM_PGA_E("OUT5L", ARIZONA_OUTPUT_ENABLES_1,

		   ARIZONA_OUT5L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,

		   ARIZONA_OUT5L_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_PMU),