diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-17 17:20:16 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-17 17:20:16 +0100 |
| commit | 70fe99d8dbbcff8b61b613e738e9d133ed2d2b15 (patch) | |
| tree | ae5c0095908c5f68d912268d97d4e962f2ab1283 /include/sound/soc-dapm.h | |
| parent | 87fd83fd3ca933dbb5bd97226c1890c7b4659c72 (diff) | |
| parent | cf1f7c6e8756646db7a0d883013cedd90eb90dd4 (diff) | |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'include/sound/soc-dapm.h')
| -rw-r--r-- | include/sound/soc-dapm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 385c6329a967..69e8e0799d4d 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -311,6 +311,8 @@ struct device; #define SND_SOC_DAPM_POST_PMD 0x8 /* after widget power down */ #define SND_SOC_DAPM_PRE_REG 0x10 /* before audio path setup */ #define SND_SOC_DAPM_POST_REG 0x20 /* after audio path setup */ +#define SND_SOC_DAPM_WILL_PMU 0x40 /* called at start of sequence */ +#define SND_SOC_DAPM_WILL_PMD 0x80 /* called at start of sequence */ #define SND_SOC_DAPM_PRE_POST_PMD \ (SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD) |