Commit 24e9e57f authored by Mark Brown's avatar Mark Brown

ASoC: dapm: Sort speakers after other outputs

Currently we sequence speakers with line and headphone outputs in DAPM.
This works well when speakers are integrate into a CODEC but when there is
an external speaker driver connected to a line or headphone output it can
mean that the speaker driver ends up getting sequenced such that it picks
up pops and clicks from the CODEC. Mask this by moving speakers after the
other outputs in DAPM.

We may want to consider doing this for headphones too but separate drivers
are less common there and headphone drivers often also function as line
outputs so the situation is less clear.
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230324-asoc-dapm-spk-v1-1-e1f27f766505@kernel.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 461b56f2
...@@ -99,52 +99,52 @@ static int dapm_up_seq[] = { ...@@ -99,52 +99,52 @@ static int dapm_up_seq[] = {
[snd_soc_dapm_adc] = 11, [snd_soc_dapm_adc] = 11,
[snd_soc_dapm_out_drv] = 12, [snd_soc_dapm_out_drv] = 12,
[snd_soc_dapm_hp] = 12, [snd_soc_dapm_hp] = 12,
[snd_soc_dapm_spk] = 12,
[snd_soc_dapm_line] = 12, [snd_soc_dapm_line] = 12,
[snd_soc_dapm_sink] = 12, [snd_soc_dapm_sink] = 12,
[snd_soc_dapm_kcontrol] = 13, [snd_soc_dapm_spk] = 13,
[snd_soc_dapm_post] = 14, [snd_soc_dapm_kcontrol] = 14,
[snd_soc_dapm_post] = 15,
}; };
static int dapm_down_seq[] = { static int dapm_down_seq[] = {
[snd_soc_dapm_pre] = 1, [snd_soc_dapm_pre] = 1,
[snd_soc_dapm_kcontrol] = 2, [snd_soc_dapm_kcontrol] = 2,
[snd_soc_dapm_adc] = 3, [snd_soc_dapm_adc] = 3,
[snd_soc_dapm_hp] = 4,
[snd_soc_dapm_spk] = 4, [snd_soc_dapm_spk] = 4,
[snd_soc_dapm_line] = 4, [snd_soc_dapm_hp] = 5,
[snd_soc_dapm_out_drv] = 4, [snd_soc_dapm_line] = 5,
[snd_soc_dapm_sink] = 4, [snd_soc_dapm_out_drv] = 5,
[snd_soc_dapm_pga] = 5, [snd_soc_dapm_sink] = 6,
[snd_soc_dapm_buffer] = 5, [snd_soc_dapm_pga] = 6,
[snd_soc_dapm_scheduler] = 5, [snd_soc_dapm_buffer] = 6,
[snd_soc_dapm_effect] = 5, [snd_soc_dapm_scheduler] = 6,
[snd_soc_dapm_src] = 5, [snd_soc_dapm_effect] = 6,
[snd_soc_dapm_asrc] = 5, [snd_soc_dapm_src] = 6,
[snd_soc_dapm_encoder] = 5, [snd_soc_dapm_asrc] = 6,
[snd_soc_dapm_decoder] = 5, [snd_soc_dapm_encoder] = 6,
[snd_soc_dapm_switch] = 6, [snd_soc_dapm_decoder] = 6,
[snd_soc_dapm_mixer_named_ctl] = 6, [snd_soc_dapm_switch] = 7,
[snd_soc_dapm_mixer] = 6, [snd_soc_dapm_mixer_named_ctl] = 7,
[snd_soc_dapm_dac] = 7, [snd_soc_dapm_mixer] = 7,
[snd_soc_dapm_mic] = 8, [snd_soc_dapm_dac] = 8,
[snd_soc_dapm_siggen] = 8, [snd_soc_dapm_mic] = 9,
[snd_soc_dapm_input] = 8, [snd_soc_dapm_siggen] = 9,
[snd_soc_dapm_output] = 8, [snd_soc_dapm_input] = 9,
[snd_soc_dapm_micbias] = 9, [snd_soc_dapm_output] = 9,
[snd_soc_dapm_vmid] = 9, [snd_soc_dapm_micbias] = 10,
[snd_soc_dapm_mux] = 10, [snd_soc_dapm_vmid] = 10,
[snd_soc_dapm_demux] = 10, [snd_soc_dapm_mux] = 11,
[snd_soc_dapm_aif_in] = 11, [snd_soc_dapm_demux] = 11,
[snd_soc_dapm_aif_out] = 11, [snd_soc_dapm_aif_in] = 12,
[snd_soc_dapm_dai_in] = 11, [snd_soc_dapm_aif_out] = 12,
[snd_soc_dapm_dai_out] = 11, [snd_soc_dapm_dai_in] = 12,
[snd_soc_dapm_dai_link] = 12, [snd_soc_dapm_dai_out] = 12,
[snd_soc_dapm_supply] = 13, [snd_soc_dapm_dai_link] = 13,
[snd_soc_dapm_clock_supply] = 14, [snd_soc_dapm_supply] = 14,
[snd_soc_dapm_pinctrl] = 14, [snd_soc_dapm_clock_supply] = 15,
[snd_soc_dapm_regulator_supply] = 14, [snd_soc_dapm_pinctrl] = 15,
[snd_soc_dapm_post] = 15, [snd_soc_dapm_regulator_supply] = 15,
[snd_soc_dapm_post] = 16,
}; };
static void dapm_assert_locked(struct snd_soc_dapm_context *dapm) static void dapm_assert_locked(struct snd_soc_dapm_context *dapm)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment