diff options
| author | Mark Brown | 2013-06-17 18:20:11 +0200 |
|---|---|---|
| committer | Mark Brown | 2013-06-17 18:20:11 +0200 |
| commit | a87c863c7b8e05874887347397b0c687b31d12b8 (patch) | |
| tree | 7fafe2acb53db38b5a80eb44047d525dd6282911 /sound/soc/soc-dapm.c | |
| parent | Merge remote-tracking branch 'asoc/fix/adsp' into asoc-linus (diff) | |
| parent | ASoC: dapm: Add snd_soc_dapm_switch to the power up/down sequence table (diff) | |
| download | kernel-qcow2-linux-a87c863c7b8e05874887347397b0c687b31d12b8.tar.gz kernel-qcow2-linux-a87c863c7b8e05874887347397b0c687b31d12b8.tar.xz kernel-qcow2-linux-a87c863c7b8e05874887347397b0c687b31d12b8.zip | |
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index c7051c457b75..fe2be283508b 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -64,6 +64,7 @@ static int dapm_up_seq[] = { [snd_soc_dapm_virt_mux] = 5, [snd_soc_dapm_value_mux] = 5, [snd_soc_dapm_dac] = 6, + [snd_soc_dapm_switch] = 7, [snd_soc_dapm_mixer] = 7, [snd_soc_dapm_mixer_named_ctl] = 7, [snd_soc_dapm_pga] = 8, @@ -83,6 +84,7 @@ static int dapm_down_seq[] = { [snd_soc_dapm_line] = 2, [snd_soc_dapm_out_drv] = 2, [snd_soc_dapm_pga] = 4, + [snd_soc_dapm_switch] = 5, [snd_soc_dapm_mixer_named_ctl] = 5, [snd_soc_dapm_mixer] = 5, [snd_soc_dapm_dac] = 6, |