diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 06:24:09 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 06:24:09 -0400 |
| commit | 10abe843d5f08793fb684eaef3739f3c26635e42 (patch) | |
| tree | 1d1eec1a55f780f3170a3f04515d4629934766d8 /include | |
| parent | 07797e9bb67f801c04d47b323f631ff16bf2bc7e (diff) | |
| parent | 863ebddec85c5ce2fb2e7742e8834a3bd69a2512 (diff) | |
Merge remote-tracking branch 'asoc/topic/mxs' into asoc-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc-dai.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index b0ee6590b8ba..800c101bb096 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h | |||
| @@ -169,6 +169,13 @@ struct snd_soc_dai_ops { | |||
| 169 | struct snd_soc_dai *); | 169 | struct snd_soc_dai *); |
| 170 | int (*prepare)(struct snd_pcm_substream *, | 170 | int (*prepare)(struct snd_pcm_substream *, |
| 171 | struct snd_soc_dai *); | 171 | struct snd_soc_dai *); |
| 172 | /* | ||
| 173 | * NOTE: Commands passed to the trigger function are not necessarily | ||
| 174 | * compatible with the current state of the dai. For example this | ||
| 175 | * sequence of commands is possible: START STOP STOP. | ||
| 176 | * So do not unconditionally use refcounting functions in the trigger | ||
| 177 | * function, e.g. clk_enable/disable. | ||
| 178 | */ | ||
| 172 | int (*trigger)(struct snd_pcm_substream *, int, | 179 | int (*trigger)(struct snd_pcm_substream *, int, |
| 173 | struct snd_soc_dai *); | 180 | struct snd_soc_dai *); |
| 174 | int (*bespoke_trigger)(struct snd_pcm_substream *, int, | 181 | int (*bespoke_trigger)(struct snd_pcm_substream *, int, |