diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-17 12:55:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-17 12:55:43 -0400 |
commit | 47ebe00b684c2bc183a766bc33c8b5943bc0df85 (patch) | |
tree | c0f155acc5623f6990d20b7a623f48f5e7aa0f61 /drivers/dma/dmatest.c | |
parent | fa121bb3fed6313b1f0af23952301e06cf6d32ed (diff) | |
parent | 5c274ca4cfb22a455e880f61536b1894fa29fd17 (diff) |
Merge tag 'dmaengine-5.3-rc1' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine updates from Vinod Koul:
- Add support in dmaengine core to do device node checks for DT devices
and update bunch of drivers to use that and remove open coding from
drivers
- New driver/driver support for new hardware, namely:
- MediaTek UART APDMA
- Freescale i.mx7ulp edma2
- Synopsys eDMA IP core version 0
- Allwinner H6 DMA
- Updates to axi-dma and support for interleaved cyclic transfers
- Greg's debugfs return value check removals on drivers
- Updates to stm32-dma, hsu, dw, pl330, tegra drivers
* tag 'dmaengine-5.3-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (68 commits)
dmaengine: Revert "dmaengine: fsl-edma: add i.mx7ulp edma2 version support"
dmaengine: at_xdmac: check for non-empty xfers_list before invoking callback
Documentation: dmaengine: clean up description of dmatest usage
dmaengine: tegra210-adma: remove PM_CLK dependency
dmaengine: fsl-edma: add i.mx7ulp edma2 version support
dt-bindings: dma: fsl-edma: add new i.mx7ulp-edma
dmaengine: fsl-edma-common: version check for v2 instead
dmaengine: fsl-edma-common: move dmamux register to another single function
dmaengine: fsl-edma: add drvdata for fsl-edma
dmaengine: Revert "dmaengine: fsl-edma: support little endian for edma driver"
dmaengine: rcar-dmac: Reject zero-length slave DMA requests
dmaengine: dw: Enable iDMA 32-bit on Intel Elkhart Lake
dmaengine: dw-edma: fix semicolon.cocci warnings
dmaengine: sh: usb-dmac: Use [] to denote a flexible array member
dmaengine: dmatest: timeout value of -1 should specify infinite wait
dmaengine: dw: Distinguish ->remove() between DW and iDMA 32-bit
dmaengine: fsl-edma: support little endian for edma driver
dmaengine: hsu: Revert "set HSU_CH_MTSR to memory width"
dmagengine: pl330: add code to get reset property
dt-bindings: pl330: document the optional resets property
...
Diffstat (limited to 'drivers/dma/dmatest.c')
-rw-r--r-- | drivers/dma/dmatest.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c index d0ad46e916a6..3d22ae8dca72 100644 --- a/drivers/dma/dmatest.c +++ b/drivers/dma/dmatest.c | |||
@@ -62,7 +62,7 @@ MODULE_PARM_DESC(pq_sources, | |||
62 | static int timeout = 3000; | 62 | static int timeout = 3000; |
63 | module_param(timeout, uint, S_IRUGO | S_IWUSR); | 63 | module_param(timeout, uint, S_IRUGO | S_IWUSR); |
64 | MODULE_PARM_DESC(timeout, "Transfer Timeout in msec (default: 3000), " | 64 | MODULE_PARM_DESC(timeout, "Transfer Timeout in msec (default: 3000), " |
65 | "Pass -1 for infinite timeout"); | 65 | "Pass 0xFFFFFFFF (4294967295) for maximum timeout"); |
66 | 66 | ||
67 | static bool noverify; | 67 | static bool noverify; |
68 | module_param(noverify, bool, S_IRUGO | S_IWUSR); | 68 | module_param(noverify, bool, S_IRUGO | S_IWUSR); |
@@ -94,7 +94,7 @@ MODULE_PARM_DESC(transfer_size, "Optional custom transfer size in bytes (default | |||
94 | * @iterations: iterations before stopping test | 94 | * @iterations: iterations before stopping test |
95 | * @xor_sources: number of xor source buffers | 95 | * @xor_sources: number of xor source buffers |
96 | * @pq_sources: number of p+q source buffers | 96 | * @pq_sources: number of p+q source buffers |
97 | * @timeout: transfer timeout in msec, -1 for infinite timeout | 97 | * @timeout: transfer timeout in msec, 0 - 0xFFFFFFFF (4294967295) |
98 | */ | 98 | */ |
99 | struct dmatest_params { | 99 | struct dmatest_params { |
100 | unsigned int buf_size; | 100 | unsigned int buf_size; |
@@ -105,7 +105,7 @@ struct dmatest_params { | |||
105 | unsigned int iterations; | 105 | unsigned int iterations; |
106 | unsigned int xor_sources; | 106 | unsigned int xor_sources; |
107 | unsigned int pq_sources; | 107 | unsigned int pq_sources; |
108 | int timeout; | 108 | unsigned int timeout; |
109 | bool noverify; | 109 | bool noverify; |
110 | bool norandom; | 110 | bool norandom; |
111 | int alignment; | 111 | int alignment; |