forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'dmaengine-5.14-rc1' of git://git.kernel.org/pub/scm/linux/…
…kernel/git/vkoul/dmaengine Pull dmaengine updates from Vinod Koul: "This time around we have a smaller pull request than usual and this includes code removal, so should be good! New drivers/devices - Support for QCOM SM8250 GPI DMA - removal of shdma-of driver and binding Updates: - arm-pl08x yaml binding move - altera-msgdma gained DT support - removal of imx-sdma platform data support - idxd and xilinx driver updates" * tag 'dmaengine-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine: (22 commits) dmaengine: imx-sdma: Remove platform data header dmaengine: xilinx: dpdma: Fix spacing around addr[i-1] dmaengine: xilinx: dpdma: Use kernel type u32 over uint32_t dmaengine: altera-msgdma: add OF support MAINTAINERS: add entry for Altera mSGDMA dt-bindings: dma: add schema for altera-msgdma dmaengine: xilinx: dpdma: fix kernel-doc dmaengine: sf-pdma: apply proper spinlock flags in sf_pdma_prep_dma_memcpy() dmaengine: sh: Remove unused shdma-of driver dt-bindings: dmaengine: Remove SHDMA Device Tree bindings dmaengine: qcom: gpi: Add SM8250 compatible dt-bindings: dmaengine: qcom: gpi: add compatible for sm8250 dmaengine: sun4i: Use list_move_tail instead of list_del/list_add_tail dmaengine: ti: omap-dma: Skip pointless cpu_pm context restore on errors dmaengine: hsu: Account transferred bytes dmaengine: Move kdoc description of struct dma_chan_percpu closer to it dmaengine: xilinx: dpdma: Print debug message when losing vsync race dmaengine: xilinx: dpdma: Print channel number in kernel log messages dt-bindings: dma: convert arm-pl08x to yaml dmaengine: idxd: remove devm allocation for idxd->int_handles ...
- Loading branch information
Showing
21 changed files
with
333 additions
and
313 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/dma/altr,msgdma.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Altera mSGDMA IP core | ||
|
||
maintainers: | ||
- Olivier Dautricourt <[email protected]> | ||
|
||
description: | | ||
Altera / Intel modular Scatter-Gather Direct Memory Access (mSGDMA) | ||
intellectual property (IP) | ||
allOf: | ||
- $ref: "dma-controller.yaml#" | ||
|
||
properties: | ||
compatible: | ||
const: altr,socfpga-msgdma | ||
|
||
reg: | ||
items: | ||
- description: Control and Status Register Slave Port | ||
- description: Descriptor Slave Port | ||
- description: Response Slave Port | ||
|
||
reg-names: | ||
items: | ||
- const: csr | ||
- const: desc | ||
- const: resp | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
"#dma-cells": | ||
const: 1 | ||
description: | ||
The cell identifies the channel id (must be 0) | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- reg-names | ||
- interrupts | ||
|
||
unevaluatedProperties: false | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/interrupt-controller/irq.h> | ||
msgdma_controller: dma-controller@ff200b00 { | ||
compatible = "altr,socfpga-msgdma"; | ||
reg = <0xff200b00 0x100>, <0xff200c00 0x100>, <0xff200d00 0x100>; | ||
reg-names = "csr", "desc", "resp"; | ||
interrupts = <0 67 IRQ_TYPE_LEVEL_HIGH>; | ||
#dma-cells = <1>; | ||
}; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,136 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/dma/arm-pl08x.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: ARM PrimeCells PL080 and PL081 and derivatives DMA controller | ||
|
||
maintainers: | ||
- Vinod Koul <[email protected]> | ||
|
||
allOf: | ||
- $ref: "dma-controller.yaml#" | ||
|
||
# We need a select here so we don't match all nodes with 'arm,primecell' | ||
select: | ||
properties: | ||
compatible: | ||
contains: | ||
enum: | ||
- arm,pl080 | ||
- arm,pl081 | ||
required: | ||
- compatible | ||
|
||
properties: | ||
compatible: | ||
oneOf: | ||
- items: | ||
- enum: | ||
- arm,pl080 | ||
- arm,pl081 | ||
- const: arm,primecell | ||
- items: | ||
- const: faraday,ftdma020 | ||
- const: arm,pl080 | ||
- const: arm,primecell | ||
|
||
reg: | ||
maxItems: 1 | ||
description: Address range of the PL08x registers | ||
|
||
interrupts: | ||
minItems: 1 | ||
description: The PL08x interrupt number | ||
|
||
clocks: | ||
minItems: 1 | ||
description: The clock running the IP core clock | ||
|
||
clock-names: | ||
maxItems: 1 | ||
|
||
lli-bus-interface-ahb1: | ||
type: boolean | ||
description: if AHB master 1 is eligible for fetching LLIs | ||
|
||
lli-bus-interface-ahb2: | ||
type: boolean | ||
description: if AHB master 2 is eligible for fetching LLIs | ||
|
||
mem-bus-interface-ahb1: | ||
type: boolean | ||
description: if AHB master 1 is eligible for fetching memory contents | ||
|
||
mem-bus-interface-ahb2: | ||
type: boolean | ||
description: if AHB master 2 is eligible for fetching memory contents | ||
|
||
memcpy-burst-size: | ||
$ref: /schemas/types.yaml#/definitions/uint32 | ||
enum: | ||
- 1 | ||
- 4 | ||
- 8 | ||
- 16 | ||
- 32 | ||
- 64 | ||
- 128 | ||
- 256 | ||
description: the size of the bursts for memcpy | ||
|
||
memcpy-bus-width: | ||
$ref: /schemas/types.yaml#/definitions/uint32 | ||
enum: | ||
- 8 | ||
- 16 | ||
- 32 | ||
- 64 | ||
description: bus width used for memcpy in bits. FTDMAC020 also accept 64 bits | ||
|
||
required: | ||
- reg | ||
- interrupts | ||
- clocks | ||
- clock-names | ||
- "#dma-cells" | ||
|
||
unevaluatedProperties: false | ||
|
||
examples: | ||
- | | ||
dmac0: dma-controller@10130000 { | ||
compatible = "arm,pl080", "arm,primecell"; | ||
reg = <0x10130000 0x1000>; | ||
interrupt-parent = <&vica>; | ||
interrupts = <15>; | ||
clocks = <&hclkdma0>; | ||
clock-names = "apb_pclk"; | ||
lli-bus-interface-ahb1; | ||
lli-bus-interface-ahb2; | ||
mem-bus-interface-ahb2; | ||
memcpy-burst-size = <256>; | ||
memcpy-bus-width = <32>; | ||
#dma-cells = <2>; | ||
}; | ||
- | | ||
#include <dt-bindings/interrupt-controller/irq.h> | ||
#include <dt-bindings/reset/cortina,gemini-reset.h> | ||
#include <dt-bindings/clock/cortina,gemini-clock.h> | ||
dma-controller@67000000 { | ||
compatible = "faraday,ftdma020", "arm,pl080", "arm,primecell"; | ||
/* Faraday Technology FTDMAC020 variant */ | ||
arm,primecell-periphid = <0x0003b080>; | ||
reg = <0x67000000 0x1000>; | ||
interrupts = <9 IRQ_TYPE_EDGE_RISING>; | ||
resets = <&syscon GEMINI_RESET_DMAC>; | ||
clocks = <&syscon GEMINI_CLK_AHB>; | ||
clock-names = "apb_pclk"; | ||
/* Bus interface AHB1 (AHB0) is totally tilted */ | ||
lli-bus-interface-ahb2; | ||
mem-bus-interface-ahb2; | ||
memcpy-burst-size = <256>; | ||
memcpy-bus-width = <32>; | ||
#dma-cells = <2>; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -791,6 +791,14 @@ M: Ley Foon Tan <[email protected]> | |
S: Maintained | ||
F: drivers/mailbox/mailbox-altera.c | ||
|
||
ALTERA MSGDMA IP CORE DRIVER | ||
M: Olivier Dautricourt <[email protected]> | ||
R: Stefan Roese <[email protected]> | ||
L: [email protected] | ||
S: Odd Fixes | ||
F: Documentation/devicetree/bindings/dma/altr,msgdma.yaml | ||
F: drivers/dma/altera-msgdma.c | ||
|
||
ALTERA PIO DRIVER | ||
M: Joyce Ooi <[email protected]> | ||
L: [email protected] | ||
|
Oops, something went wrong.