diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2015-10-30 22:05:07 -0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-10-30 22:05:07 -0400 |
| commit | 6df056d8e69a557ac76bc7a88960e4addbc98386 (patch) | |
| tree | 6329893f9dc953d3a87a2a6a6a22356d99d0562c /include/linux/platform_data | |
| parent | 67d25f0d4e24775418aae403610cae99e27cdc3c (diff) | |
| parent | df5c7386f62d2db95ca48005087195e9a15e2b1f (diff) | |
Merge branch 'topic/dw' into for-linus
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/dma-dw.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/platform_data/dma-dw.h b/include/linux/platform_data/dma-dw.h index 87ac14c584f2..03b6095d3b18 100644 --- a/include/linux/platform_data/dma-dw.h +++ b/include/linux/platform_data/dma-dw.h | |||
| @@ -37,6 +37,7 @@ struct dw_dma_slave { | |||
| 37 | * @nr_channels: Number of channels supported by hardware (max 8) | 37 | * @nr_channels: Number of channels supported by hardware (max 8) |
| 38 | * @is_private: The device channels should be marked as private and not for | 38 | * @is_private: The device channels should be marked as private and not for |
| 39 | * by the general purpose DMA channel allocator. | 39 | * by the general purpose DMA channel allocator. |
| 40 | * @is_memcpy: The device channels do support memory-to-memory transfers. | ||
| 40 | * @chan_allocation_order: Allocate channels starting from 0 or 7 | 41 | * @chan_allocation_order: Allocate channels starting from 0 or 7 |
| 41 | * @chan_priority: Set channel priority increasing from 0 to 7 or 7 to 0. | 42 | * @chan_priority: Set channel priority increasing from 0 to 7 or 7 to 0. |
| 42 | * @block_size: Maximum block size supported by the controller | 43 | * @block_size: Maximum block size supported by the controller |
| @@ -47,6 +48,7 @@ struct dw_dma_slave { | |||
| 47 | struct dw_dma_platform_data { | 48 | struct dw_dma_platform_data { |
| 48 | unsigned int nr_channels; | 49 | unsigned int nr_channels; |
| 49 | bool is_private; | 50 | bool is_private; |
| 51 | bool is_memcpy; | ||
| 50 | #define CHAN_ALLOCATION_ASCENDING 0 /* zero to seven */ | 52 | #define CHAN_ALLOCATION_ASCENDING 0 /* zero to seven */ |
| 51 | #define CHAN_ALLOCATION_DESCENDING 1 /* seven to zero */ | 53 | #define CHAN_ALLOCATION_DESCENDING 1 /* seven to zero */ |
| 52 | unsigned char chan_allocation_order; | 54 | unsigned char chan_allocation_order; |
