diff options
| author | Shengjiu Wang <b02247@freescale.com> | 2013-08-09 14:41:11 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2013-08-23 07:30:18 +0800 |
| commit | 565b776f7f69fc2d68541f7751b6313b56a513d1 (patch) | |
| tree | f360262a319d736dc5478b2956d5f5b49a668e19 /include | |
| parent | 3c19bca9c270e08ee89a9871ad06113a8e9e65b4 (diff) | |
ENGR00274585-1 dma: imx-sdma: update sdma to support p2p
For the sake of support asrc p2p, the sdma driver need to be updated.
1. Add another dma_request, p2p need two dma_request.
2. There are some cases which need to change the config after the
dma_request_channel. add dma_request config in dmaengine_slave_config().
3. add dma_request0 and dma_request1 in dma_slave_config for runtime config
in dmaengine_slave_config.
Signed-off-by: Shengjiu Wang <b02247@freescale.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dmaengine.h | 4 | ||||
| -rw-r--r-- | include/linux/platform_data/dma-imx.h | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 96d3e4ab11a9..1b9cdc1fa655 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -341,6 +341,8 @@ enum dma_slave_buswidth { * @slave_id: Slave requester id. Only valid for slave channels. The dma * slave peripheral will have unique id as dma requester which need to be * pass as slave config. + * @dma_request0: this is the first dma request of this dma channel. + * @dma_request1: this is the second dma request of this dma channel. * * This struct is passed in as configuration data to a DMA engine * in order to set up a certain channel for DMA transport at runtime. @@ -369,6 +371,8 @@ struct dma_slave_config { u32 dst_maxburst; bool device_fc; unsigned int slave_id; + int dma_request0; + int dma_request1; }; static inline const char *dma_chan_name(struct dma_chan *chan) diff --git a/include/linux/platform_data/dma-imx.h b/include/linux/platform_data/dma-imx.h index 3558f05273a3..ac4e9e958e82 100644 --- a/include/linux/platform_data/dma-imx.h +++ b/include/linux/platform_data/dma-imx.h @@ -48,7 +48,8 @@ enum imx_dma_prio { }; struct imx_dma_data { - int dma_request; /* DMA request line */ + int dma_request0; /* DMA request line */ + int dma_request1; enum sdma_peripheral_type peripheral_type; int priority; }; |