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

Commit 344ee799 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 5fca4c12 c60f1169

sound/soc/soc-dapm.c

+5 −5
Original line number Diff line number Diff line
@@ -74,8 +74,7 @@ static int dapm_up_seq[] = { 
	[snd_soc_dapm_dai_link] = 2,

	[snd_soc_dapm_dai_in] = 4,

	[snd_soc_dapm_dai_out] = 4,

	[snd_soc_dapm_aif_in] = 4,

	[snd_soc_dapm_aif_out] = 4,

	[snd_soc_dapm_adc] = 4,

	[snd_soc_dapm_mic] = 5,

	[snd_soc_dapm_mux] = 6,

	[snd_soc_dapm_demux] = 6,
@@ -84,7 +83,8 @@ static int dapm_up_seq[] = { 
	[snd_soc_dapm_mixer] = 8,

	[snd_soc_dapm_mixer_named_ctl] = 8,

	[snd_soc_dapm_pga] = 9,

	[snd_soc_dapm_adc] = 10,

	[snd_soc_dapm_aif_in] = 9,

	[snd_soc_dapm_aif_out] = 9,

	[snd_soc_dapm_out_drv] = 11,

	[snd_soc_dapm_hp] = 11,

	[snd_soc_dapm_spk] = 11,
@@ -96,6 +96,8 @@ static int dapm_up_seq[] = { 
static int dapm_down_seq[] = {

	[snd_soc_dapm_pre] = 0,

	[snd_soc_dapm_kcontrol] = 1,

	[snd_soc_dapm_aif_in] = 2,

	[snd_soc_dapm_aif_out] = 2,

	[snd_soc_dapm_adc] = 5,

	[snd_soc_dapm_hp] = 3,

	[snd_soc_dapm_spk] = 3,
@@ -110,8 +112,6 @@ static int dapm_down_seq[] = { 
	[snd_soc_dapm_micbias] = 8,

	[snd_soc_dapm_mux] = 9,

	[snd_soc_dapm_demux] = 9,

	[snd_soc_dapm_aif_in] = 10,

	[snd_soc_dapm_aif_out] = 10,

	[snd_soc_dapm_dai_in] = 10,

	[snd_soc_dapm_dai_out] = 10,

	[snd_soc_dapm_dai_link] = 11,