diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-24 12:49:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-24 12:49:37 -0400 |
| commit | d6a4c0e5d3d433ef296f8f417e835329a834a256 (patch) | |
| tree | a65de394ea1afeeccee9f84dc7e6cd21e2660639 | |
| parent | 474095e46cd14421821da3201a9fd6a4c070996b (diff) | |
| parent | cdde0e61cf2d41123604c6c9d8f09ef5c23464ee (diff) | |
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine updates from Vinod Koul:
- new drivers for:
- Ingenic JZ4780 controller
- APM X-Gene controller
- Freescale RaidEngine device
- Renesas USB Controller
- remove device_alloc_chan_resources dummy handlers
- sh driver cleanups for peri peri and related emmc and asoc patches
as well
- fixes and enhancements spread over the drivers
* 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (59 commits)
dmaengine: dw: don't prompt for DW_DMAC_CORE
dmaengine: shdmac: avoid unused variable warnings
dmaengine: fix platform_no_drv_owner.cocci warnings
dmaengine: pch_dma: fix memory leak on failure path in pch_dma_probe()
dmaengine: at_xdmac: unlock spin lock before return
dmaengine: xgene: devm_ioremap() returns NULL on error
dmaengine: xgene: buffer overflow in xgene_dma_init_channels()
dmaengine: usb-dmac: Fix dereferencing freed memory 'desc'
dmaengine: sa11x0: report slave capabilities to upper layers
dmaengine: vdma: Fix compilation warnings
dmaengine: fsl_raid: statify fsl_re_chan_probe
dmaengine: Driver support for FSL RaidEngine device.
dmaengine: xgene_dma_init_ring_mngr() can be static
Documentation: dma: Add documentation for the APM X-Gene SoC DMA device DTS binding
arm64: dts: Add APM X-Gene SoC DMA device and DMA clock DTS nodes
dmaengine: Add support for APM X-Gene SoC DMA engine driver
dmaengine: usb-dmac: Add Renesas USB DMA Controller (USB-DMAC) driver
dmaengine: renesas,usb-dmac: Add device tree bindings documentation
dmaengine: edma: fixed wrongly initialized data parameter to the edma callback
dmaengine: ste_dma40: fix implicit conversion
...
81 files changed, 5770 insertions, 775 deletions
diff --git a/Documentation/devicetree/bindings/dma/apm-xgene-dma.txt b/Documentation/devicetree/bindings/dma/apm-xgene-dma.txt new file mode 100644 index 000000000000..d3058768b23d --- /dev/null +++ b/Documentation/devicetree/bindings/dma/apm-xgene-dma.txt | |||
| @@ -0,0 +1,47 @@ | |||
| 1 | Applied Micro X-Gene SoC DMA nodes | ||
| 2 | |||
| 3 | DMA nodes are defined to describe on-chip DMA interfaces in | ||
| 4 | APM X-Gene SoC. | ||
| 5 | |||
| 6 | Required properties for DMA interfaces: | ||
| 7 | - compatible: Should be "apm,xgene-dma". | ||
| 8 | - device_type: set to "dma". | ||
| 9 | - reg: Address and length of the register set for the device. | ||
| 10 | It contains the information of registers in the following order: | ||
| 11 | 1st - DMA control and status register address space. | ||
| 12 | 2nd - Descriptor ring control and status register address space. | ||
| 13 | 3rd - Descriptor ring command register address space. | ||
| 14 | 4th - Soc efuse register address space. | ||
| 15 | - interrupts: DMA has 5 interrupts sources. 1st interrupt is | ||
| 16 | DMA error reporting interrupt. 2nd, 3rd, 4th and 5th interrupts | ||
| 17 | are completion interrupts for each DMA channels. | ||
| 18 | - clocks: Reference to the clock entry. | ||
| 19 | |||
| 20 | Optional properties: | ||
| 21 | - dma-coherent : Present if dma operations are coherent | ||
| 22 | |||
| 23 | Example: | ||
| 24 | dmaclk: dmaclk@1f27c000 { | ||
| 25 | compatible = "apm,xgene-device-clock"; | ||
| 26 | #clock-cells = <1>; | ||
| 27 | clocks = <&socplldiv2 0>; | ||
| 28 | reg = <0x0 0x1f27c000 0x0 0x1000>; | ||
| 29 | reg-names = "csr-reg"; | ||
| 30 | clock-output-names = "dmaclk"; | ||
| 31 | }; | ||
| 32 | |||
| 33 | dma: dma@1f270000 { | ||
| 34 | compatible = "apm,xgene-storm-dma"; | ||
| 35 | device_type = "dma"; | ||
| 36 | reg = <0x0 0x1f270000 0x0 0x10000>, | ||
| 37 | <0x0 0x1f200000 0x0 0x10000>, | ||
| 38 | <0x0 0x1b008000 0x0 0x2000>, | ||
| 39 | <0x0 0x1054a000 0x0 0x100>; | ||
| 40 | interrupts = <0x0 0x82 0x4>, | ||
| 41 | <0x0 0xb8 0x4>, | ||
| 42 | <0x0 0xb9 0x4>, | ||
| 43 | <0x0 0xba 0x4>, | ||
| 44 | <0x0 0xbb 0x4>; | ||
| 45 | dma-coherent; | ||
| 46 | clocks = <&dmaclk 0>; | ||
| 47 | }; | ||
diff --git a/Documentation/devicetree/bindings/dma/jz4780-dma.txt b/Documentation/devicetree/bindings/dma/jz4780-dma.txt new file mode 100644 index 000000000000..f25feee62b15 --- /dev/null +++ b/Documentation/devicetree/bindings/dma/jz4780-dma.txt | |||
| @@ -0,0 +1,56 @@ | |||
| 1 | * Ingenic JZ4780 DMA Controller | ||
| 2 | |||
| 3 | Required properties: | ||
