diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-17 11:26:59 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-17 11:26:59 -0400 |
commit | 1ca04065c3569beb42b9376952df8c96f430f753 (patch) | |
tree | 615b39ac205ae987b46aa363eecc4a1f27827990 /sound/soc | |
parent | b14b76a56e49946488637ee68926c5180c39fdb1 (diff) |
ASoC: Power speakers and headphones simultaneously
Speaker and headphone outputs do not need to be handled separately
since they can't be part of the same path.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/soc-dapm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 8997fb34dddd..88461310dc96 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c | |||
@@ -64,15 +64,15 @@ static int dapm_up_seq[] = { | |||
64 | [snd_soc_dapm_pga] = 7, | 64 | [snd_soc_dapm_pga] = 7, |
65 | [snd_soc_dapm_adc] = 8, | 65 | [snd_soc_dapm_adc] = 8, |
66 | [snd_soc_dapm_hp] = 9, | 66 | [snd_soc_dapm_hp] = 9, |
67 | [snd_soc_dapm_spk] = 10, | 67 | [snd_soc_dapm_spk] = 9, |
68 | [snd_soc_dapm_post] = 11, | 68 | [snd_soc_dapm_post] = 10, |
69 | }; | 69 | }; |
70 | 70 | ||
71 | static int dapm_down_seq[] = { | 71 | static int dapm_down_seq[] = { |
72 | [snd_soc_dapm_pre] = 0, | 72 | [snd_soc_dapm_pre] = 0, |
73 | [snd_soc_dapm_adc] = 1, | 73 | [snd_soc_dapm_adc] = 1, |
74 | [snd_soc_dapm_hp] = 2, | 74 | [snd_soc_dapm_hp] = 2, |
75 | [snd_soc_dapm_spk] = 3, | 75 | [snd_soc_dapm_spk] = 2, |
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] = 5, | 78 | [snd_soc_dapm_mixer] = 5, |