Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Environments

Snippets Groups Projects

00043a26

Commit 00043a26 authored 4 years ago by Vinod Koul

Downloads
- Plain Diff

Merge branch 'topic/xilinx' into fixes

 Conflicts:
	Documentation/driver-api/dmaengine/provider.rst
	include/linux/dmaengine.h

parents 0b5ad7b9 bc227385

No related branches found

No related tags found

No related merge requests found

Changes 9

Expand all Show whitespace changes

Inline Side-by-side

Showing

Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml 68 additions, 0 deletions

...ion/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml
Documentation/driver-api/dmaengine/client.rst 3 additions, 1 deletion

Documentation/driver-api/dmaengine/client.rst
Documentation/driver-api/dmaengine/provider.rst 49 additions, 0 deletions

Documentation/driver-api/dmaengine/provider.rst
MAINTAINERS 9 additions, 0 deletions

MAINTAINERS
drivers/dma/Kconfig 10 additions, 0 deletions

drivers/dma/Kconfig
drivers/dma/xilinx/Makefile 1 addition, 0 deletions

drivers/dma/xilinx/Makefile
drivers/dma/xilinx/xilinx_dpdma.c 1535 additions, 0 deletions

drivers/dma/xilinx/xilinx_dpdma.c
include/dt-bindings/dma/xlnx-zynqmp-dpdma.h 16 additions, 0 deletions

include/dt-bindings/dma/xlnx-zynqmp-dpdma.h
include/linux/dmaengine.h 17 additions, 0 deletions

include/linux/dmaengine.h

with 1708 additions and 1 deletion

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment