diff options
| author | Vinod Koul <vkoul@kernel.org> | 2020-08-07 07:43:37 +0200 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2020-08-07 07:43:37 +0200 |
| commit | 00043a2689232631f39ebbf6719d545b1d799086 (patch) | |
| tree | 0660e8e30210547562ad9132be0255b795453d73 /MAINTAINERS | |
| parent | Merge branch 'for-linus' into fixes (diff) | |
| parent | dmaengine: xilinx: dpdma: Fix kerneldoc warning (diff) | |
| download | linux-00043a2689232631f39ebbf6719d545b1d799086.tar.xz linux-00043a2689232631f39ebbf6719d545b1d799086.zip | |
Merge branch 'topic/xilinx' into fixes
Conflicts:
Documentation/driver-api/dmaengine/provider.rst
include/linux/dmaengine.h
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9af8f81f726d..1ba09904354f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -18847,6 +18847,15 @@ F: Documentation/devicetree/bindings/media/xilinx/ F: drivers/media/platform/xilinx/ F: include/uapi/linux/xilinx-v4l2-controls.h +XILINX ZYNQMP DPDMA DRIVER +M: Hyun Kwon <hyun.kwon@xilinx.com> +M: Laurent Pinchart <laurent.pinchart@ideasonboard.com> +L: dmaengine@vger.kernel.org +S: Supported +F: Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml +F: drivers/dma/xilinx/xilinx_dpdma.c +F: include/dt-bindings/dma/xlnx-zynqmp-dpdma.h + XILLYBUS DRIVER M: Eli Billauer <eli.billauer@gmail.com> L: linux-kernel@vger.kernel.org |