Merge "Revert "ASoC: Update the widgets power up/down sequence""

This commit is contained in:
qctecmdr 2020-05-06 01:33:17 -07:00 • committed by Gerrit - the friendly Code Review server
commit acbfb2fe83

View file

@ -74,8 +74,9 @@ static int dapm_up_seq[] = {
[snd_soc_dapm_dai_link] = 3,
[snd_soc_dapm_dai_in] = 5,
[snd_soc_dapm_dai_out] = 5,
[snd_soc_dapm_mic] = 5,
[snd_soc_dapm_adc] = 6,
[snd_soc_dapm_aif_in] = 5,
[snd_soc_dapm_aif_out] = 5,
[snd_soc_dapm_mic] = 6,
[snd_soc_dapm_siggen] = 6,
[snd_soc_dapm_input] = 6,
[snd_soc_dapm_output] = 6,
@ -86,8 +87,6 @@ static int dapm_up_seq[] = {
[snd_soc_dapm_mixer] = 9,
[snd_soc_dapm_mixer_named_ctl] = 9,
[snd_soc_dapm_pga] = 10,
[snd_soc_dapm_aif_in] = 10,
[snd_soc_dapm_aif_out] = 10,
[snd_soc_dapm_buffer] = 10,
[snd_soc_dapm_scheduler] = 10,
[snd_soc_dapm_effect] = 10,
@ -95,6 +94,7 @@ static int dapm_up_seq[] = {
[snd_soc_dapm_asrc] = 10,
[snd_soc_dapm_encoder] = 10,
[snd_soc_dapm_decoder] = 10,
[snd_soc_dapm_adc] = 11,
[snd_soc_dapm_out_drv] = 12,
[snd_soc_dapm_hp] = 12,
[snd_soc_dapm_spk] = 12,
@ -107,9 +107,7 @@ static int dapm_up_seq[] = {
static int dapm_down_seq[] = {
[snd_soc_dapm_pre] = 1,
[snd_soc_dapm_kcontrol] = 2,
[snd_soc_dapm_aif_in] = 3,
[snd_soc_dapm_aif_out] = 3,
[snd_soc_dapm_adc] = 6,
[snd_soc_dapm_adc] = 3,
[snd_soc_dapm_hp] = 4,
[snd_soc_dapm_spk] = 4,
[snd_soc_dapm_line] = 4,
@ -135,6 +133,8 @@ static int dapm_down_seq[] = {
[snd_soc_dapm_vmid] = 9,
[snd_soc_dapm_mux] = 10,
[snd_soc_dapm_demux] = 10,
[snd_soc_dapm_aif_in] = 11,
[snd_soc_dapm_aif_out] = 11,
[snd_soc_dapm_dai_in] = 11,
[snd_soc_dapm_dai_out] = 11,
[snd_soc_dapm_dai_link] = 12,