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

Commit e3d4dabd authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Sort specialised mixers and muxes together 



The more flexible value muxes and named mixers don't need to be sorted
differently from a power management point of view, they are different
only in terms of the control interface and not in terms of seqencing
behaviour.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent b22ead2a

sound/soc/soc-dapm.c

+17 −17
Original line number Diff line number Diff line
@@ -57,15 +57,15 @@ static int dapm_up_seq[] = { 
	[snd_soc_dapm_micbias] = 2,

	[snd_soc_dapm_mic] = 3,

	[snd_soc_dapm_mux] = 4,

	[snd_soc_dapm_value_mux] = 5,

	[snd_soc_dapm_dac] = 6,

	[snd_soc_dapm_mixer] = 7,

	[snd_soc_dapm_mixer_named_ctl] = 8,

	[snd_soc_dapm_pga] = 9,

	[snd_soc_dapm_adc] = 10,

	[snd_soc_dapm_hp] = 11,

	[snd_soc_dapm_spk] = 12,

	[snd_soc_dapm_post] = 13,

	[snd_soc_dapm_value_mux] = 4,

	[snd_soc_dapm_dac] = 5,

	[snd_soc_dapm_mixer] = 6,

	[snd_soc_dapm_mixer_named_ctl] = 6,

	[snd_soc_dapm_pga] = 7,

	[snd_soc_dapm_adc] = 8,

	[snd_soc_dapm_hp] = 9,

	[snd_soc_dapm_spk] = 10,

	[snd_soc_dapm_post] = 11,

};



static int dapm_down_seq[] = {
@@ -75,14 +75,14 @@ static int dapm_down_seq[] = { 
	[snd_soc_dapm_spk] = 3,

	[snd_soc_dapm_pga] = 4,

	[snd_soc_dapm_mixer_named_ctl] = 5,

	[snd_soc_dapm_mixer] = 6,

	[snd_soc_dapm_dac] = 7,

	[snd_soc_dapm_mic] = 8,

	[snd_soc_dapm_micbias] = 9,

	[snd_soc_dapm_mux] = 10,

	[snd_soc_dapm_value_mux] = 11,

	[snd_soc_dapm_supply] = 12,

	[snd_soc_dapm_post] = 13,

	[snd_soc_dapm_mixer] = 5,

	[snd_soc_dapm_dac] = 6,

	[snd_soc_dapm_mic] = 7,

	[snd_soc_dapm_micbias] = 8,

	[snd_soc_dapm_mux] = 9,

	[snd_soc_dapm_value_mux] = 9,

	[snd_soc_dapm_supply] = 10,

	[snd_soc_dapm_post] = 11,

};



static void pop_wait(u32 pop_time)