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 /include/linux/dma | |
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 'include/linux/dma')
-rw-r--r-- | include/linux/dma/edma.h | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/include/linux/dma/edma.h b/include/linux/dma/edma.h new file mode 100644 index 000000000000..cab6e18773da --- /dev/null +++ b/include/linux/dma/edma.h | |||
@@ -0,0 +1,47 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
2 | /* | ||
3 | * Copyright (c) 2018-2019 Synopsys, Inc. and/or its affiliates. | ||
4 | * Synopsys DesignWare eDMA core driver | ||
5 | * | ||
6 | * Author: Gustavo Pimentel <gustavo.pimentel@synopsys.com> | ||
7 | */ | ||
8 | |||
9 | #ifndef _DW_EDMA_H | ||
10 | #define _DW_EDMA_H | ||
11 | |||
12 | #include <linux/device.h> | ||
13 | #include <linux/dmaengine.h> | ||
14 | |||
15 | struct dw_edma; | ||
16 | |||
17 | /** | ||
18 | * struct dw_edma_chip - representation of DesignWare eDMA controller hardware | ||
19 | * @dev: struct device of the eDMA controller | ||
20 | * @id: instance ID | ||
21 | * @irq: irq line | ||
22 | * @dw: struct dw_edma that is filed by dw_edma_probe() | ||
23 | */ | ||
24 | struct dw_edma_chip { | ||
25 | struct device *dev; | ||
26 | int id; | ||
27 | int irq; | ||
28 | struct dw_edma *dw; | ||
29 | }; | ||
30 | |||
31 | /* Export to the platform drivers */ | ||
32 | #if IS_ENABLED(CONFIG_DW_EDMA) | ||
33 | int dw_edma_probe(struct dw_edma_chip *chip); | ||
34 | int dw_edma_remove(struct dw_edma_chip *chip); | ||
35 | #else | ||
36 | static inline int dw_edma_probe(struct dw_edma_chip *chip) | ||
37 | { | ||
38 | return -ENODEV; | ||
39 | } | ||
40 | |||
41 | static inline int dw_edma_remove(struct dw_edma_chip *chip) | ||
42 | { | ||
43 | return 0; | ||
44 | } | ||
45 | #endif /* CONFIG_DW_EDMA */ | ||
46 | |||
47 | #endif /* _DW_EDMA_H */ | ||