diff options
| author | Mark Brown <broonie@linaro.org> | 2014-02-20 18:47:45 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-20 18:47:45 +0900 |
| commit | e96cb48482f8852716d89d0e6baf6d2c425ae33e (patch) | |
| tree | fe59837b96c556dee53f85922391da45f72740b8 /include/sound | |
| parent | 30ac6b6ebd175eaf5db7e0d7c015cd1460548b98 (diff) | |
| parent | 113911006442a36c2b4669faf1699d9042ef80ab (diff) | |
| download | linux-stable-e96cb48482f8852716d89d0e6baf6d2c425ae33e.tar.gz linux-stable-e96cb48482f8852716d89d0e6baf6d2c425ae33e.tar.bz2 linux-stable-e96cb48482f8852716d89d0e6baf6d2c425ae33e.zip | |
Merge branch 'fix/dapm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-dapm
Diffstat (limited to 'include/sound')
| -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 68d92e36facd..6e89ef6c11c1 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); |