aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/platform_data
diff options
context:
space:
mode:
authorEugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>2016-11-25 09:59:07 -0500
committerVinod Koul <vinod.koul@intel.com>2016-11-29 22:27:50 -0500
commitbd2c6636cc59c4626a04d9918953a107f88eaff9 (patch)
tree7344ad146e1b6be5f86b5584563195b060cd489f /include/linux/platform_data
parent258f2277a93fe0e3cdac275264d275c526170db6 (diff)
dmaengine: DW DMAC: add multi-block property to device tree
Several versions of DW DMAC have multi block transfers hardware support. Hardware support of multi block transfers is disabled by default if we use DT to configure DMAC and software emulation of multi block transfers used instead. Add multi-block property, so it is possible to enable hardware multi block transfers (if present) via DT. Switch from per device is_nollp variable to multi_block array to be able enable/disable multi block transfers separately per channel. Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'include/linux/platform_data')
-rw-r--r--include/linux/platform_data/dma-dw.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/platform_data/dma-dw.h b/include/linux/platform_data/dma-dw.h
index 5f0e11e7354c..e69e415d0d98 100644
--- a/include/linux/platform_data/dma-dw.h
+++ b/include/linux/platform_data/dma-dw.h
@@ -14,6 +14,7 @@
14#include <linux/device.h> 14#include <linux/device.h>
15 15
16#define DW_DMA_MAX_NR_MASTERS 4 16#define DW_DMA_MAX_NR_MASTERS 4
17#define DW_DMA_MAX_NR_CHANNELS 8
17 18
18/** 19/**
19 * struct dw_dma_slave - Controller-specific information about a slave 20 * struct dw_dma_slave - Controller-specific information about a slave
@@ -40,19 +41,18 @@ struct dw_dma_slave {
40 * @is_private: The device channels should be marked as private and not for 41 * @is_private: The device channels should be marked as private and not for
41 * by the general purpose DMA channel allocator. 42 * by the general purpose DMA channel allocator.
42 * @is_memcpy: The device channels do support memory-to-memory transfers. 43 * @is_memcpy: The device channels do support memory-to-memory transfers.
43 * @is_nollp: The device channels does not support multi block transfers.
44 * @chan_allocation_order: Allocate channels starting from 0 or 7 44 * @chan_allocation_order: Allocate channels starting from 0 or 7
45 * @chan_priority: Set channel priority increasing from 0 to 7 or 7 to 0. 45 * @chan_priority: Set channel priority increasing from 0 to 7 or 7 to 0.
46 * @block_size: Maximum block size supported by the controller 46 * @block_size: Maximum block size supported by the controller
47 * @nr_masters: Number of AHB masters supported by the controller 47 * @nr_masters: Number of AHB masters supported by the controller
48 * @data_width: Maximum data width supported by hardware per AHB master 48 * @data_width: Maximum data width supported by hardware per AHB master
49 * (in bytes, power of 2) 49 * (in bytes, power of 2)
50 * @multi_block: Multi block transfers supported by hardware per channel.
50 */ 51 */
51struct dw_dma_platform_data { 52struct dw_dma_platform_data {
52 unsigned int nr_channels; 53 unsigned int nr_channels;
53 bool is_private; 54 bool is_private;
54 bool is_memcpy; 55 bool is_memcpy;
55 bool is_nollp;
56#define CHAN_ALLOCATION_ASCENDING 0 /* zero to seven */ 56#define CHAN_ALLOCATION_ASCENDING 0 /* zero to seven */
57#define CHAN_ALLOCATION_DESCENDING 1 /* seven to zero */ 57#define CHAN_ALLOCATION_DESCENDING 1 /* seven to zero */
58 unsigned char chan_allocation_order; 58 unsigned char chan_allocation_order;
@@ -62,6 +62,7 @@ struct dw_dma_platform_data {
62 unsigned int block_size; 62 unsigned int block_size;
63 unsigned char nr_masters; 63 unsigned char nr_masters;
64 unsigned char data_width[DW_DMA_MAX_NR_MASTERS]; 64 unsigned char data_width[DW_DMA_MAX_NR_MASTERS];
65 unsigned char multi_block[DW_DMA_MAX_NR_CHANNELS];
65}; 66};
66 67
67#endif /* _PLATFORM_DATA_DMA_DW_H */ 68#endif /* _PLATFORM_DATA_DMA_DW_H */