diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-07-24 01:28:09 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-07-24 01:48:05 +0300 |
| commit | 41206a073ceebc517245677a19f52ba6379b33a9 (patch) | |
| tree | 2fc35aac6abe32b99058ad55b0fc6e4d449d1056 /include/sound/dmaengine_pcm.h | |
| parent | 206739119508d5ab4b42ab480ff61a7e6cd72d7c (diff) | |
| parent | ba47d845d715a010f7b51f6f89bae32845e6acb7 (diff) | |
| download | linux-41206a073ceebc517245677a19f52ba6379b33a9.tar.xz | |
Merge v5.8-rc6 into drm-next
I've got a silent conflict + two trees based on fixes to merge.
Fixes a silent merge with amdgpu
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/sound/dmaengine_pcm.h')
| -rw-r--r-- | include/sound/dmaengine_pcm.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/sound/dmaengine_pcm.h b/include/sound/dmaengine_pcm.h index b65220685920..8c5e38180fb0 100644 --- a/include/sound/dmaengine_pcm.h +++ b/include/sound/dmaengine_pcm.h @@ -161,4 +161,15 @@ int snd_dmaengine_pcm_prepare_slave_config(struct snd_pcm_substream *substream, #define SND_DMAENGINE_PCM_DRV_NAME "snd_dmaengine_pcm" +struct dmaengine_pcm { + struct dma_chan *chan[SNDRV_PCM_STREAM_LAST + 1]; + const struct snd_dmaengine_pcm_config *config; + struct snd_soc_component component; + unsigned int flags; +}; + +static inline struct dmaengine_pcm *soc_component_to_pcm(struct snd_soc_component *p) +{ + return container_of(p, struct dmaengine_pcm, component); +} #endif |