diff options
author | Mark Brown <broonie@linaro.org> | 2014-02-23 03:20:32 (GMT) |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-02-23 03:20:32 (GMT) |
commit | 45d39cbf00f7093929dd336967854ffac8ed8826 (patch) | |
tree | eab349c598ac1baa24481aa757329a111fcbcdf1 /include | |
parent | d9fb50e499efc0a99cbaf10861df204911902a2a (diff) | |
parent | 113911006442a36c2b4669faf1699d9042ef80ab (diff) | |
download | linux-45d39cbf00f7093929dd336967854ffac8ed8826.tar.xz |
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
Diffstat (limited to 'include')
-rw-r--r-- | include/sound/soc-dapm.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 68d92e3..6e89ef6 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -449,14 +449,22 @@ void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm, /* dapm audio pin control and status */ int snd_soc_dapm_enable_pin(struct snd_soc_dapm_context *dapm, const char *pin); +int snd_soc_dapm_enable_pin_unlocked(struct snd_soc_dapm_context *dapm, + const char *pin); int snd_soc_dapm_disable_pin(struct snd_soc_dapm_context *dapm, const char *pin); +int snd_soc_dapm_disable_pin_unlocked(struct snd_soc_dapm_context *dapm, + const char *pin); int snd_soc_dapm_nc_pin(struct snd_soc_dapm_context *dapm, const char *pin); +int snd_soc_dapm_nc_pin_unlocked(struct snd_soc_dapm_context *dapm, + const char *pin); int snd_soc_dapm_get_pin_status(struct snd_soc_dapm_context *dapm, const char *pin); int snd_soc_dapm_sync(struct snd_soc_dapm_context *dapm); int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm, const char *pin); +int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm, + const char *pin); int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm, const char *pin); void snd_soc_dapm_auto_nc_codec_pins(struct snd_soc_codec *codec); |