diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-18 14:05:30 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-18 14:05:30 (GMT) |
| commit | d45a26bd9790fcde58cf4b11a775ff56c6b44e0b (patch) | |
| tree | 71b75e94b7a586123331eed46e91d25dd88ff52a /sound/soc/omap/mcbsp.h | |
| parent | 8ef53f689afea7f2da360cb27d7af040c1216bfa (diff) | |
| parent | 22f38f792ec53e2a93be13ecb609bbe911ed8ff9 (diff) | |
| download | linux-fsl-qoriq-d45a26bd9790fcde58cf4b11a775ff56c6b44e0b.tar.xz | |
Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
Diffstat (limited to 'sound/soc/omap/mcbsp.h')
| -rw-r--r-- | sound/soc/omap/mcbsp.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/omap/mcbsp.h b/sound/soc/omap/mcbsp.h index f93e0b0..96d1b08 100644 --- a/sound/soc/omap/mcbsp.h +++ b/sound/soc/omap/mcbsp.h @@ -24,14 +24,14 @@ #ifndef __ASOC_MCBSP_H #define __ASOC_MCBSP_H -#include "omap-pcm.h" - #ifdef CONFIG_ARCH_OMAP1 #define mcbsp_omap1() 1 #else #define mcbsp_omap1() 0 #endif +#include <sound/dmaengine_pcm.h> + /* McBSP register numbers. Register address offset = num * reg_step */ enum { /* Common registers */ @@ -312,7 +312,8 @@ struct omap_mcbsp { struct omap_mcbsp_platform_data *pdata; struct omap_mcbsp_st_data *st_data; struct omap_mcbsp_reg_cfg cfg_regs; - struct omap_pcm_dma_data dma_data[2]; + struct snd_dmaengine_dai_dma_data dma_data[2]; + unsigned int dma_req[2]; int dma_op_mode; u16 max_tx_thres; u16 max_rx_thres; |