diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-07-07 19:18:46 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-07-07 19:18:46 +0100 |
commit | 3f405b46a91c0c4cdfa6077b4e1853f35a94e8ef (patch) | |
tree | 46d8032c9f224d28f258c44727a7165c9ba47c85 /sound/soc/davinci/davinci-pcm.h | |
parent | 4ec5c9693b46ab34976511cd43bf75c3a0fc704d (diff) | |
parent | efd13be09e2db4ac4efa2c6101c4f50ee1ead4b0 (diff) |
Merge branch 'davinci' into for-2.6.32
Conflicts:
sound/soc/davinci/davinci-i2s.c
Diffstat (limited to 'sound/soc/davinci/davinci-pcm.h')
-rw-r--r-- | sound/soc/davinci/davinci-pcm.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sound/soc/davinci/davinci-pcm.h b/sound/soc/davinci/davinci-pcm.h index 62cb4eb07e3..eb4287faa3d 100644 --- a/sound/soc/davinci/davinci-pcm.h +++ b/sound/soc/davinci/davinci-pcm.h @@ -12,17 +12,19 @@ #ifndef _DAVINCI_PCM_H #define _DAVINCI_PCM_H +#include <mach/edma.h> +#include <mach/asp.h> + + struct davinci_pcm_dma_params { - char *name; /* stream identifier */ - int channel; /* sync dma channel ID */ - dma_addr_t dma_addr; /* device physical address for DMA */ - unsigned int data_type; /* xfer data type */ + char *name; /* stream identifier */ + int channel; /* sync dma channel ID */ + dma_addr_t dma_addr; /* device physical address for DMA */ + enum dma_event_q eventq_no; /* event queue number */ + unsigned char data_type; /* xfer data type */ + unsigned char convert_mono_stereo; }; -struct evm_snd_platform_data { - int tx_dma_ch; - int rx_dma_ch; -}; extern struct snd_soc_platform davinci_soc_platform; |