From 60263da5c7be864d424d90f5711cd2239e765842 Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Tue, 7 Apr 2020 15:59:53 +0800 Subject: [PATCH] Revert "ASoC: Update the widgets power up/down sequence" This reverts commit 90cd260212250c5394414616964a165293dd4d88. Update sequence in codec driver and this change is not needed. Change-Id: I46a4f6c2676175d945c4eb6f651d0f0f640d10fd Signed-off-by: Meng Wang --- sound/soc/soc-dapm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index ff4622a8add9..41f81b1a466c 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -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,