Skip to content

Commit 91e5bfe

Browse files
committed
Merge tag 'dmaengine-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine
Pull dmaengine updates from Vinod Koul: "The dmaengine subsystem updates for this cycle consist of a new driver (Microchip) along with couple of yaml binding conversions, core api updates and bunch of driver updates etc. New HW support: - Microchip sama7d65 dma controller - Yaml conversion of atmel dma binding and Freescale Elo DMA Controller binding Core: - Remove device_prep_dma_imm_data() API as users are removed - Reduce scope of some less frequently used DMA request channel APIs with aim to cleanup these in future Updates: - Drop Fenghua Yu from idxd maintainers, as he changed jobs - AMD ptdma support for multiqueue and ae4dma deprecated PCI IDs removal" * tag 'dmaengine-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine: (29 commits) dmaengine: ptdma: Utilize the AE4DMA engine's multi-queue functionality dmaengine: ae4dma: Use the MSI count and its corresponding IRQ number dmaengine: ae4dma: Remove deprecated PCI IDs dmaengine: Remove device_prep_dma_imm_data from struct dma_device dmaengine: ti: edma: support sw triggered chans in of_edma_xlate() dmaengine: ti: k3-udma: Enable second resource range for BCDMA and PKTDMA dmaengine: fsl-edma: free irq correctly in remove path dmaengine: fsl-edma: cleanup chan after dma_async_device_unregister dt-bindings: dma: snps,dw-axi-dmac: Allow devices to be marked as noncoherent dmaengine: dmatest: Fix dmatest waiting less when interrupted dt-bindings: dma: Convert fsl,elo*-dma to YAML dt-bindings: dma: fsl-mxs-dma: Add compatible string for i.MX8 chips dmaengine: Fix typo in comment dmaengine: ti: k3-udma-glue: Drop skip_fdq argument from k3_udma_glue_reset_rx_chn dmaengine: bcm2835-dma: fix warning when CONFIG_PM=n dt-bindings: dma: fsl,edma: Add i.MX94 support dt-bindings: dma: atmel: add microchip,sama7d65-dma dmaengine: img-mdc: remove incorrect of_match_ptr annotation dmaengine: idxd: Delete unnecessary NULL check dmaengine: pxa: Enable compile test ...
2 parents e63a165 + 6565439 commit 91e5bfe

37 files changed

+682
-319
lines changed
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
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,at91sam9g45-dma.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Atmel Direct Memory Access Controller (DMA)
8+
9+
maintainers:
10+
- Ludovic Desroches <[email protected]>
11+
12+
description:
13+
The Atmel Direct Memory Access Controller (DMAC) transfers data from a source
14+
peripheral to a destination peripheral over one or more AMBA buses. One channel
15+
is required for each source/destination pair. In the most basic configuration,
16+
the DMAC has one master interface and one channel. The master interface reads
17+
the data from a source and writes it to a destination. Two AMBA transfers are
18+
required for each DMAC data transfer. This is also known as a dual-access transfer.
19+
The DMAC is programmed via the APB interface.
20+
21+
properties:
22+
compatible:
23+
enum:
24+
- atmel,at91sam9g45-dma
25+
- atmel,at91sam9rl-dma
26+
27+
reg:
28+
maxItems: 1
29+
30+
interrupts:
31+
maxItems: 1
32+
33+
"#dma-cells":
34+
description:
35+
Must be <2>, used to represent the number of integer cells in the dma
36+
property of client devices. The two cells in order are
37+
1. The first cell represents the channel number.
38+
2. The second cell is 0 for RX and 1 for TX transfers.
39+
const: 2
40+
41+
clocks:
42+
maxItems: 1
43+
44+
clock-names:
45+
const: dma_clk
46+
47+
required:
48+
- compatible
49+
- reg
50+
- interrupts
51+
- "#dma-cells"
52+
- clocks
53+
- clock-names
54+
55+
additionalProperties: false
56+
57+
examples:
58+
- |
59+
dma-controller@ffffec00 {
60+
compatible = "atmel,at91sam9g45-dma";
61+
reg = <0xffffec00 0x200>;
62+
interrupts = <21>;
63+
#dma-cells = <2>;
64+
clocks = <&pmc 2 20>;
65+
clock-names = "dma_clk";
66+
};
67+
68+
...

Documentation/devicetree/bindings/dma/atmel,sama5d4-dma.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ properties:
3232
- microchip,sam9x60-dma
3333
- microchip,sam9x7-dma
3434
- const: atmel,sama5d4-dma
35+
- items:
36+
- const: microchip,sama7d65-dma
37+
- const: microchip,sama7g5-dma
3538

3639
"#dma-cells":
3740
description: |

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

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

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@ properties:
2727
- fsl,imx93-edma4
2828
- fsl,imx95-edma5
2929
- nxp,s32g2-edma
30+
- items:
31+
- enum:
32+
- fsl,imx94-edma3
33+
- const: fsl,imx93-edma3
34+
- items:
35+
- enum:
36+
- fsl,imx94-edma5
37+
- const: fsl,imx95-edma5
3038
- items:
3139
- const: fsl,ls1028a-edma
3240
- const: fsl,vf610-edma
Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/dma/fsl,elo-dma.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Freescale Elo DMA Controller
8+
9+
maintainers:
10+
- J. Neuschäfer <[email protected]>
11+
12+
description:
13+
This is a little-endian 4-channel DMA controller, used in Freescale mpc83xx
14+
series chips such as mpc8315, mpc8349, mpc8379 etc.
15+
16+
properties:
17+
compatible:
18+
items:
19+
- enum:
20+
- fsl,mpc8313-dma
21+
- fsl,mpc8315-dma
22+
- fsl,mpc8323-dma
23+
- fsl,mpc8347-dma
24+
- fsl,mpc8349-dma
25+
- fsl,mpc8360-dma
26+
- fsl,mpc8377-dma
27+
- fsl,mpc8378-dma
28+
- fsl,mpc8379-dma
29+
- const: fsl,elo-dma
30+
31+
reg:
32+
items:
33+
- description:
34+
DMA General Status Register, i.e. DGSR which contains status for
35+
all the 4 DMA channels.
36+
37+
cell-index:
38+
$ref: /schemas/types.yaml#/definitions/uint32
39+
description: Controller index. 0 for controller @ 0x8100.
40+
41+
ranges: true
42+
43+
"#address-cells":
44+
const: 1
45+
46+
"#size-cells":
47+
const: 1
48+
49+
interrupts:
50+
maxItems: 1
51+
description: Controller interrupt.
52+
53+
required:
54+
- compatible
55+
- reg
56+
57+
patternProperties:
58+
"^dma-channel@[0-9a-f]+$":
59+
type: object
60+
additionalProperties: false
61+
62+
properties:
63+
compatible:
64+
oneOf:
65+
# native DMA channel
66+
- items:
67+
- enum:
68+
- fsl,mpc8315-dma-channel
69+
- fsl,mpc8323-dma-channel
70+
- fsl,mpc8347-dma-channel
71+
- fsl,mpc8349-dma-channel
72+
- fsl,mpc8360-dma-channel
73+
- fsl,mpc8377-dma-channel
74+
- fsl,mpc8378-dma-channel
75+
- fsl,mpc8379-dma-channel
76+
- const: fsl,elo-dma-channel
77+
78+
# audio DMA channel, see fsl,ssi.yaml
79+
- const: fsl,ssi-dma-channel
80+
81+
reg:
82+
maxItems: 1
83+
84+
cell-index:
85+
description: DMA channel index starts at 0.
86+
87+
interrupts:
88+
maxItems: 1
89+
description:
90+
Per-channel interrupt. Only necessary if no controller interrupt has
91+
been provided.
92+
93+
additionalProperties: false
94+
95+
examples:
96+
- |
97+
#include <dt-bindings/interrupt-controller/irq.h>
98+
99+
dma@82a8 {
100+
compatible = "fsl,mpc8349-dma", "fsl,elo-dma";
101+
reg = <0x82a8 4>;
102+
#address-cells = <1>;
103+
#size-cells = <1>;
104+
ranges = <0 0x8100 0x1a4>;
105+
interrupts = <71 IRQ_TYPE_LEVEL_LOW>;
106+
cell-index = <0>;
107+
108+
dma-channel@0 {
109+
compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
110+
reg = <0 0x80>;
111+
cell-index = <0>;
112+
interrupts = <71 IRQ_TYPE_LEVEL_LOW>;
113+
};
114+
115+
dma-channel@80 {
116+
compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
117+
reg = <0x80 0x80>;
118+
cell-index = <1>;
119+
interrupts = <71 IRQ_TYPE_LEVEL_LOW>;
120+
};
121+
122+
dma-channel@100 {
123+
compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
124+
reg = <0x100 0x80>;
125+
cell-index = <2>;
126+
interrupts = <71 IRQ_TYPE_LEVEL_LOW>;
127+
};
128+
129+
dma-channel@180 {
130+
compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
131+
reg = <0x180 0x80>;
132+
cell-index = <3>;
133+
interrupts = <71 IRQ_TYPE_LEVEL_LOW>;
134+
};
135+
};
136+
137+
...

0 commit comments

Comments
 (0)