aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/dma/dw_dmac.c2
-rw-r--r--include/linux/dw_dmac.h3
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index a4cf2614085a..08dab3badad2 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -1341,6 +1341,8 @@ static int __init dw_probe(struct platform_device *pdev)
1341 1341
1342 dma_cap_set(DMA_MEMCPY, dw->dma.cap_mask); 1342 dma_cap_set(DMA_MEMCPY, dw->dma.cap_mask);
1343 dma_cap_set(DMA_SLAVE, dw->dma.cap_mask); 1343 dma_cap_set(DMA_SLAVE, dw->dma.cap_mask);
1344 if (pdata->is_private)
1345 dma_cap_set(DMA_PRIVATE, dw->dma.cap_mask);
1344 dw->dma.dev = &pdev->dev; 1346 dw->dma.dev = &pdev->dev;
1345 dw->dma.device_alloc_chan_resources = dwc_alloc_chan_resources; 1347 dw->dma.device_alloc_chan_resources = dwc_alloc_chan_resources;
1346 dw->dma.device_free_chan_resources = dwc_free_chan_resources; 1348 dw->dma.device_free_chan_resources = dwc_free_chan_resources;
diff --git a/include/linux/dw_dmac.h b/include/linux/dw_dmac.h
index 8014eb81054d..deec66b37180 100644
--- a/include/linux/dw_dmac.h
+++ b/include/linux/dw_dmac.h
@@ -16,9 +16,12 @@
16/** 16/**
17 * struct dw_dma_platform_data - Controller configuration parameters 17 * struct dw_dma_platform_data - Controller configuration parameters
18 * @nr_channels: Number of channels supported by hardware (max 8) 18 * @nr_channels: Number of channels supported by hardware (max 8)
19 * @is_private: The device channels should be marked as private and not for
20 * by the general purpose DMA channel allocator.
19 */ 21 */
20struct dw_dma_platform_data { 22struct dw_dma_platform_data {
21 unsigned int nr_channels; 23 unsigned int nr_channels;
24 bool is_private;
22}; 25};
23 26
24/** 27/**