diff options
| author | Vinod Koul <vkoul@kernel.org> | 2020-08-07 11:13:37 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2020-08-07 11:13:37 +0530 |
| commit | 00043a2689232631f39ebbf6719d545b1d799086 (patch) | |
| tree | 0660e8e30210547562ad9132be0255b795453d73 /drivers/dma/Kconfig | |
| parent | 0b5ad7b9522e6172342511fac6114fd8b7eb622a (diff) | |
| parent | bc227385eb71f2cb453efeddc053265bbd2525f9 (diff) | |
| download | linux-00043a2689232631f39ebbf6719d545b1d799086.tar.bz2 | |
Merge branch 'topic/xilinx' into fixes
Conflicts:
Documentation/driver-api/dmaengine/provider.rst
include/linux/dmaengine.h
Diffstat (limited to 'drivers/dma/Kconfig')
| -rw-r--r-- | drivers/dma/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index bfe0731f3764..518a1437862a 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -708,6 +708,16 @@ config XILINX_ZYNQMP_DMA help Enable support for Xilinx ZynqMP DMA controller. +config XILINX_ZYNQMP_DPDMA + tristate "Xilinx DPDMA Engine" + select DMA_ENGINE + select DMA_VIRTUAL_CHANNELS + help + Enable support for Xilinx ZynqMP DisplayPort DMA. Choose this option + if you have a Xilinx ZynqMP SoC with a DisplayPort subsystem. The + driver provides the dmaengine required by the DisplayPort subsystem + display driver. + config ZX_DMA tristate "ZTE ZX DMA support" depends on ARCH_ZX || COMPILE_TEST |