diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-01-21 07:10:14 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-01-21 07:10:14 (GMT) |
commit | 842a2097007b8a01a71a701300e970502a54bbb2 (patch) | |
tree | 64f8ad8b41513fda0710cc6097968f11d0083ce5 /Documentation/sound/alsa/soc/platform.txt | |
parent | 2f36f5e1ffcc18deee234b9085fabd2828f59ee0 (diff) | |
parent | c88c2823e87dd6f8214b8b8cdc36d45f205a8077 (diff) | |
download | linux-fsl-qoriq-842a2097007b8a01a71a701300e970502a54bbb2.tar.xz |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'Documentation/sound/alsa/soc/platform.txt')
-rw-r--r-- | Documentation/sound/alsa/soc/platform.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Documentation/sound/alsa/soc/platform.txt b/Documentation/sound/alsa/soc/platform.txt index 06d8359..d57efad 100644 --- a/Documentation/sound/alsa/soc/platform.txt +++ b/Documentation/sound/alsa/soc/platform.txt @@ -20,9 +20,10 @@ struct snd_soc_ops { int (*trigger)(struct snd_pcm_substream *, int); }; -The platform driver exports its DMA functionality via struct snd_soc_platform:- +The platform driver exports its DMA functionality via struct +snd_soc_platform_driver:- -struct snd_soc_platform { +struct snd_soc_platform_driver { char *name; int (*probe)(struct platform_device *pdev); @@ -34,6 +35,13 @@ struct snd_soc_platform { int (*pcm_new)(struct snd_card *, struct snd_soc_codec_dai *, struct snd_pcm *); void (*pcm_free)(struct snd_pcm *); + /* + * For platform caused delay reporting. + * Optional. + */ + snd_pcm_sframes_t (*delay)(struct snd_pcm_substream *, + struct snd_soc_dai *); + /* platform stream ops */ struct snd_pcm_ops *pcm_ops; }; |