Skip to content

Commit 7c775c6

Browse files
committed
Merge tag 'dmaengine-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine
Pull dmaengine updates from Vinod Koul: "A bunch of new device support and updates to few drivers, biggest of them amd ones. New support: - TI J722S CSI BCDMA controller support - Intel idxd Panther Lake family platforms - Allwinner F1C100s suniv DMA - Qualcomm QCS615, QCS8300, SM8750, SA8775P GPI dma controller support - AMD ae4dma controller support and reorganisation of amd driver Updates: - Channel page support for Nvidia Tegra210 adma driver - Freescale support for S32G based platforms - Yamilfy atmel dma bindings" * tag 'dmaengine-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine: (45 commits) dmaengine: idxd: Enable Function Level Reset (FLR) for halt dmaengine: idxd: Refactor halt handler dmaengine: idxd: Add idxd_device_config_save() and idxd_device_config_restore() helpers dmaengine: idxd: Binding and unbinding IDXD device and driver dmaengine: idxd: Add idxd_pci_probe_alloc() helper dt-bindings: dma: atmel: Convert to json schema dt-bindings: dma: st-stm32-dmamux: Add description for dma-cell values dmaengine: qcom: gpi: Add GPI immediate DMA support for SPI protocol dt-bindings: dma: adi,axi-dmac: deprecate adi,channels node dt-bindings: dma: adi,axi-dmac: convert to yaml schema dmaengine: mv_xor: switch to for_each_child_of_node_scoped() dmaengine: bcm2835-dma: Prevent suspend if DMA channel is busy dmaengine: tegra210-adma: Support channel page dt-bindings: dma: Support channel page to nvidia,tegra210-adma dmaengine: ti: k3-udma: Add support for J722S CSI BCDMA dt-bindings: dma: ti: k3-bcdma: Add J722S CSI BCDMA dmaengine: ti: edma: fix OF node reference leaks in edma_driver dmaengine: ti: edma: make the loop condition simpler in edma_probe() dmaengine: fsl-edma: read/write multiple registers in cyclic transactions dmaengine: fsl-edma: add support for S32G based platforms ...
2 parents ebbb8be + 98d187a commit 7c775c6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+2061
-377
lines changed

Documentation/devicetree/bindings/dma/adi,axi-dmac.txt

Lines changed: 0 additions & 61 deletions
This file was deleted.
Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/dma/adi,axi-dmac.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Analog Devices AXI-DMAC DMA controller
8+
9+
description: |
10+
FPGA-based DMA controller designed for use with high-speed converter hardware.
11+
12+
http://analogdevicesinc.github.io/hdl/library/axi_dmac/index.html
13+
14+
maintainers:
15+
- Nuno Sa <nuno.sa@analog.com>
16+
17+
additionalProperties: false
18+
19+
properties:
20+
compatible:
21+
const: adi,axi-dmac-1.00.a
22+
23+
reg:
24+
maxItems: 1
25+
26+
interrupts:
27+
maxItems: 1
28+
29+
clocks:
30+
maxItems: 1
31+
32+
"#dma-cells":
33+
const: 1
34+
35+
adi,channels:
36+
deprecated: true
37+
type: object
38+
description:
39+
This sub-node must contain a sub-node for each DMA channel. This node is
40+
only required for IP versions older than 4.3.a and should otherwise be
41+
omitted.
42+
additionalProperties: false
43+
44+
properties:
45+
"#size-cells":
46+
const: 0
47+
"#address-cells":
48+
const: 1
49+
50+
patternProperties:
51+
"^dma-channel@[0-9a-f]+$":
52+
type: object
53+
description:
54+
DMA channel properties based on HDL compile-time configuration.
55+
additionalProperties: false
56+
57+
properties:
58+
reg:
59+
maxItems: 1
60+
61+
adi,source-bus-width:
62+
$ref: /schemas/types.yaml#/definitions/uint32
63+
description: Width of the source bus in bits.
64+
enum: [8, 16, 32, 64, 128]
65+
66+
adi,destination-bus-width:
67+
$ref: /schemas/types.yaml#/definitions/uint32
68+
description: Width of the destination bus in bits.
69+
enum: [8, 16, 32, 64, 128]
70+
71+
adi,source-bus-type:
72+
$ref: /schemas/types.yaml#/definitions/uint32
73+
description: |
74+
Type of the source bus.
75+
76+
0: Memory mapped AXI interface
77+
1: Streaming AXI interface
78+
2: FIFO interface
79+
enum: [0, 1, 2]
80+
81+
adi,destination-bus-type:
82+
$ref: /schemas/types.yaml#/definitions/uint32
83+
description: Type of the destination bus (see adi,source-bus-type).
84+
enum: [0, 1, 2]
85+
86+
adi,length-width:
87+
deprecated: true
88+
$ref: /schemas/types.yaml#/definitions/uint32
89+
description: Width of the DMA transfer length register.
90+
91+
adi,cyclic:
92+
deprecated: true
93+
type: boolean
94+
description:
95+
Must be set if the channel supports hardware cyclic DMA transfers.
96+
97+
adi,2d:
98+
deprecated: true
99+
type: boolean
100+
description:
101+
Must be set if the channel supports hardware 2D DMA transfers.
102+
103+
required:
104+
- reg
105+
- adi,source-bus-width
106+
- adi,destination-bus-width
107+
- adi,source-bus-type
108+
- adi,destination-bus-type
109+
110+
required:
111+
- "#size-cells"
112+
- "#address-cells"
113+
114+
required:
115+
- compatible
116+
- reg
117+
- interrupts
118+
- clocks
119+
- "#dma-cells"
120+
121+
examples:
122+
- |
123+
dma-controller@7c420000 {
124+
compatible = "adi,axi-dmac-1.00.a";
125+
reg = <0x7c420000 0x10000>;
126+
interrupts = <0 57 0>;
127+
clocks = <&clkc 16>;
128+
#dma-cells = <1>;
129+
};

Documentation/devicetree/bindings/dma/allwinner,sun4i-a10-dma.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ properties:
2222
number.
2323

2424
compatible:
25-
const: allwinner,sun4i-a10-dma
25+
enum:
26+
- allwinner,sun4i-a10-dma
27+
- allwinner,suniv-f1c100s-dma
2628

2729
reg:
2830
maxItems: 1
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/dma/atmel,sama5d4-dma.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Microchip AT91 Extensible Direct Memory Access Controller
8+
9+
maintainers:
10+
- Nicolas Ferre <nicolas.ferre@microchip.com>
11+
- Charan Pedumuru <charan.pedumuru@microchip.com>
12+
13+
description:
14+
The DMA Controller (XDMAC) is a AHB-protocol central direct memory access
15+
controller. It performs peripheral data transfer and memory move operations
16+
over one or two bus ports through the unidirectional communication
17+
channel. Each channel is fully programmable and provides both peripheral
18+
or memory-to-memory transfers. The channel features are configurable at
19+
implementation.
20+
21+
allOf:
22+
- $ref: dma-controller.yaml#
23+
24+
properties:
25+
compatible:
26+
oneOf:
27+
- enum:
28+
- atmel,sama5d4-dma
29+
- microchip,sama7g5-dma
30+
- items:
31+
- enum:
32+
- microchip,sam9x60-dma
33+
- microchip,sam9x7-dma
34+
- const: atmel,sama5d4-dma
35+
36+
"#dma-cells":
37+
description: |
38+
Represents the number of integer cells in the `dmas` property of client
39+
devices. The single cell specifies the channel configuration register:
40+
- bit 13: SIF (Source Interface Identifier) for memory interface.
41+
- bit 14: DIF (Destination Interface Identifier) for peripheral interface.
42+
- bit 30-24: PERID (Peripheral Identifier).
43+
const: 1
44+
45+
reg:
46+
maxItems: 1
47+
48+
interrupts:
49+
maxItems: 1
50+
51+
clocks:
52+
maxItems: 1
53+
54+
clock-names:
55+
const: dma_clk
56+
57+
required:
58+
- compatible
59+
- reg
60+
- interrupts
61+
- clocks
62+
- clock-names
63+
- "#dma-cells"
64+
65+
unevaluatedProperties: false
66+
67+
examples:
68+
- |
69+
#include <dt-bindings/clock/at91.h>
70+
#include <dt-bindings/dma/at91.h>
71+
#include <dt-bindings/interrupt-controller/irq.h>
72+
dma-controller@f0008000 {
73+
compatible = "atmel,sama5d4-dma";
74+
reg = <0xf0008000 0x1000>;
75+
interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
76+
#dma-cells = <1>;
77+
clocks = <&pmc PMC_TYPE_PERIPHERAL 20>;
78+
clock-names = "dma_clk";
79+
};

Documentation/devicetree/bindings/dma/atmel-xdma.txt

Lines changed: 0 additions & 54 deletions
This file was deleted.

Documentation/devicetree/bindings/dma/fsl,edma.yaml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,13 @@ properties:
2626
- fsl,imx93-edma3
2727
- fsl,imx93-edma4
2828
- fsl,imx95-edma5
29+
- nxp,s32g2-edma
2930
- items:
3031
- const: fsl,ls1028a-edma
3132
- const: fsl,vf610-edma
33+
- items:
34+
- const: nxp,s32g3-edma
35+
- const: nxp,s32g2-edma
3236

3337
reg:
3438
minItems: 1
@@ -221,6 +225,36 @@ allOf:
221225
properties:
222226
power-domains: false
223227

228+
- if:
229+
properties:
230+
compatible:
231+
contains:
232+
const: nxp,s32g2-edma
233+
then:
234+
properties:
235+
clocks:
236+
minItems: 2
237+
maxItems: 2
238+
clock-names:
239+
items:
240+
- const: dmamux0
241+
- const: dmamux1
242+
interrupts:
243+
minItems: 3
244+
maxItems: 3
245+
interrupt-names:
246+
items:
247+
- const: tx-0-15
248+
- const: tx-16-31
249+
- const: err
250+
reg:
251+
minItems: 3
252+
maxItems: 3
253+
"#dma-cells":
254+
const: 2
255+
dma-channels:
256+
const: 32
257+
224258
unevaluatedProperties: false
225259

226260
examples:

0 commit comments

Comments
 (0)