diff options
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/soc-dai.h | 18 | ||||
-rw-r--r-- | include/sound/soc.h | 1 |
2 files changed, 18 insertions, 1 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 061f16d4c878..0a0b019d41ad 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h | |||
@@ -219,7 +219,6 @@ struct snd_soc_dai { | |||
219 | struct snd_soc_codec *codec; | 219 | struct snd_soc_codec *codec; |
220 | unsigned int active; | 220 | unsigned int active; |
221 | unsigned char pop_wait:1; | 221 | unsigned char pop_wait:1; |
222 | void *dma_data; | ||
223 | 222 | ||
224 | /* DAI private data */ | 223 | /* DAI private data */ |
225 | void *private_data; | 224 | void *private_data; |
@@ -230,4 +229,21 @@ struct snd_soc_dai { | |||
230 | struct list_head list; | 229 | struct list_head list; |
231 | }; | 230 | }; |
232 | 231 | ||
232 | static inline void *snd_soc_dai_get_dma_data(const struct snd_soc_dai *dai, | ||
233 | const struct snd_pcm_substream *ss) | ||
234 | { | ||
235 | return (ss->stream == SNDRV_PCM_STREAM_PLAYBACK) ? | ||
236 | dai->playback.dma_data : dai->capture.dma_data; | ||
237 | } | ||
238 | |||
239 | static inline void snd_soc_dai_set_dma_data(struct snd_soc_dai *dai, | ||
240 | const struct snd_pcm_substream *ss, | ||
241 | void *data) | ||
242 | { | ||
243 | if (ss->stream == SNDRV_PCM_STREAM_PLAYBACK) | ||
244 | dai->playback.dma_data = data; | ||
245 | else | ||
246 | dai->capture.dma_data = data; | ||
247 | } | ||
248 | |||
233 | #endif | 249 | #endif |
diff --git a/include/sound/soc.h b/include/sound/soc.h index 5d234a8c2506..a57fbfcd4c8f 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
@@ -375,6 +375,7 @@ struct snd_soc_pcm_stream { | |||
375 | unsigned int channels_min; /* min channels */ | 375 | unsigned int channels_min; /* min channels */ |
376 | unsigned int channels_max; /* max channels */ | 376 | unsigned int channels_max; /* max channels */ |
377 | unsigned int active:1; /* stream is in use */ | 377 | unsigned int active:1; /* stream is in use */ |
378 | void *dma_data; /* used by platform code */ | ||
378 | }; | 379 | }; |
379 | 380 | ||
380 | /* SoC audio ops */ | 381 | /* SoC audio ops */ |