diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-03-14 08:48:12 +0300 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-03-14 08:48:12 +0300 |
| commit | 8bce4c87657af3dc4625e873ec1201205e44375b (patch) | |
| tree | c98b33258b433a2bcb9d71b9544031e26d6aef63 /include/linux/dmaengine.h | |
| parent | 805dd3508b2398ca339f5dd3b2d11ac82ef41b5c (diff) | |
| parent | 0a18f9b268dd66c84c806a74b3bc0be6438e7ba7 (diff) | |
| download | linux-8bce4c87657af3dc4625e873ec1201205e44375b.tar.xz | |
Merge branch 'topic/pl330' into for-linus
Diffstat (limited to 'include/linux/dmaengine.h')
| -rw-r--r-- | include/linux/dmaengine.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index d85ecd20af50..017433712833 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -401,6 +401,7 @@ enum dma_residue_granularity { * since the enum dma_transfer_direction is not defined as bits for each * type of direction, the dma controller should fill (1 << <TYPE>) and same * should be checked by controller as well + * @max_burst: max burst capability per-transfer * @cmd_pause: true, if pause and thereby resume is supported * @cmd_terminate: true, if terminate cmd is supported * @residue_granularity: granularity of the reported transfer residue @@ -411,6 +412,7 @@ struct dma_slave_caps { u32 src_addr_widths; u32 dst_addr_widths; u32 directions; + u32 max_burst; bool cmd_pause; bool cmd_terminate; enum dma_residue_granularity residue_granularity; @@ -654,6 +656,7 @@ struct dma_filter { * the enum dma_transfer_direction is not defined as bits for * each type of direction, the dma controller should fill (1 << * <TYPE>) and same should be checked by controller as well + * @max_burst: max burst capability per-transfer * @residue_granularity: granularity of the transfer residue reported * by tx_status * @device_alloc_chan_resources: allocate resources and return the @@ -712,6 +715,7 @@ struct dma_device { u32 src_addr_widths; u32 dst_addr_widths; u32 directions; + u32 max_burst; bool descriptor_reuse; enum dma_residue_granularity residue_granularity; |