aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-06-07 08:08:45 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-06-08 08:51:12 -0400
commite3d4dabd2d9b74778f6f15a830eb3a0027bb3799 (patch)
tree763a77cb5962fc54a5473c8a4ab15db96a4ffcfb /sound/soc/soc-dapm.c
parentb22ead2a510fdb30440753f90237e86fdac70fae (diff)
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: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r--sound/soc/soc-dapm.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 66f07cdfb2f7..9187db18a042 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -57,15 +57,15 @@ static int dapm_up_seq[] = {
57 [snd_soc_dapm_micbias] = 2, 57 [snd_soc_dapm_micbias] = 2,
58 [snd_soc_dapm_mic] = 3, 58 [snd_soc_dapm_mic] = 3,
59 [snd_soc_dapm_mux] = 4, 59 [snd_soc_dapm_mux] = 4,
60 [snd_soc_dapm_value_mux] = 5, 60 [snd_soc_dapm_value_mux] = 4,
61 [snd_soc_dapm_dac] = 6, 61 [snd_soc_dapm_dac] = 5,
62 [snd_soc_dapm_mixer] = 7, 62 [snd_soc_dapm_mixer] = 6,
63 [snd_soc_dapm_mixer_named_ctl] = 8, 63 [snd_soc_dapm_mixer_named_ctl] = 6,
64 [snd_soc_dapm_pga] = 9, 64 [snd_soc_dapm_pga] = 7,
65 [snd_soc_dapm_adc] = 10, 65 [snd_soc_dapm_adc] = 8,
66 [snd_soc_dapm_hp] = 11, 66 [snd_soc_dapm_hp] = 9,
67 [snd_soc_dapm_spk] = 12, 67 [snd_soc_dapm_spk] = 10,
68 [snd_soc_dapm_post] = 13, 68 [snd_soc_dapm_post] = 11,
69}; 69};
70 70
71static int dapm_down_seq[] = { 71static int dapm_down_seq[] = {
@@ -75,14 +75,14 @@ static int dapm_down_seq[] = {
75 [snd_soc_dapm_spk] = 3, 75 [snd_soc_dapm_spk] = 3,
76 [snd_soc_dapm_pga] = 4, 76 [snd_soc_dapm_pga] = 4,
77 [snd_soc_dapm_mixer_named_ctl] = 5, 77 [snd_soc_dapm_mixer_named_ctl] = 5,
78 [snd_soc_dapm_mixer] = 6, 78 [snd_soc_dapm_mixer] = 5,
79 [snd_soc_dapm_dac] = 7, 79 [snd_soc_dapm_dac] = 6,
80 [snd_soc_dapm_mic] = 8, 80 [snd_soc_dapm_mic] = 7,
81 [snd_soc_dapm_micbias] = 9, 81 [snd_soc_dapm_micbias] = 8,
82 [snd_soc_dapm_mux] = 10, 82 [snd_soc_dapm_mux] = 9,
83 [snd_soc_dapm_value_mux] = 11, 83 [snd_soc_dapm_value_mux] = 9,
84 [snd_soc_dapm_supply] = 12, 84 [snd_soc_dapm_supply] = 10,
85 [snd_soc_dapm_post] = 13, 85 [snd_soc_dapm_post] = 11,
86}; 86};
87 87
88static void pop_wait(u32 pop_time) 88static void pop_wait(u32 pop_time)