Skip to content

Commit 196dacf

Browse files
torvaldstorvalds
committed
Merge tag 'dmaengine-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine
Pull dmaengine updates from Vinod Koul: "Core: - Managed API for dma channel request New support: - Sophgo CV18XX/SG200X dmamux driver - Qualcomm Milos GPI, sc8280xp GPI support Updates: - Conversion of brcm,iproc-sba and marvell,orion-xor binding - Unused code cleanup across drivers" * tag 'dmaengine-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine: (23 commits) dt-bindings: dma: fsl-mxs-dma: allow interrupt-names for fsl,imx23-dma-apbx dmaengine: xdmac: make it selectable for ARCH_MICROCHIP dt-bindings: dma: Convert marvell,orion-xor to DT schema dt-bindings: dma: Convert brcm,iproc-sba to DT schema dmaengine: nbpfaxi: Add missing check after DMA map dmaengine: mv_xor: Fix missing check after DMA map and missing unmap dt-bindings: dma: qcom,gpi: document the Milos GPI DMA Engine dmaengine: idxd: Remove __packed from structures dmaengine: ti: Do not enable by default during compile testing dmaengine: sh: Do not enable SH_DMAE_BASE by default during compile testing dmaengine: idxd: Fix warning for deadcode.deadstore dmaengine: mmp: Fix again Wvoid-pointer-to-enum-cast warning dmaengine: fsl-qdma: Add missing fsl_qdma_format kerneldoc dmaengine: qcom: gpi: Drop unused gpi_write_reg_field() dmaengine: fsl-dpaa2-qdma: Drop unused mc_enc() dmaengine: dw-edma: Drop unused dchan2dev() and chan2dev() dmaengine: stm32: Don't use %pK through printk dmaengine: stm32-dma: configure next sg only if there are more than 2 sgs dmaengine: sun4i: Simplify error handling in probe() dt-bindings: dma: qcom,gpi: Document the sc8280xp GPI DMA engine ...
2 parents 8582976 + e3a9ccd commit 196dacf

25 files changed

Lines changed: 578 additions & 184 deletions

‎Documentation/devicetree/bindings/dma/brcm,iproc-sba.txt‎

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

‎Documentation/devicetree/bindings/dma/brcm,iproc-sba.yaml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/dma/brcm,iproc-sba.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Broadcom SBA RAID engine
8+
9+
maintainers:
10+
- Ray Jui <rjui@broadcom.com>
11+
- Scott Branden <sbranden@broadcom.com>
12+
13+
properties:
14+
compatible:
15+
enum:
16+
- brcm,iproc-sba
17+
- brcm,iproc-sba-v2
18+
19+
mboxes:
20+
minItems: 1
21+
maxItems: 8
22+
23+
required:
24+
- compatible
25+
- mboxes
26+
27+
additionalProperties: false
28+
29+
examples:
30+
- |
31+
raid0 {
32+
compatible = "brcm,iproc-sba-v2";
33+
mboxes = <&raid_mbox 0 0x1 0xffff>,
34+
<&raid_mbox 1 0x1 0xffff>,
35+
<&raid_mbox 2 0x1 0xffff>,
36+
<&raid_mbox 3 0x1 0xffff>,
37+
<&raid_mbox 4 0x1 0xffff>,
38+
<&raid_mbox 5 0x1 0xffff>,
39+
<&raid_mbox 6 0x1 0xffff>,
40+
<&raid_mbox 7 0x1 0xffff>;
41+
};

‎Documentation/devicetree/bindings/dma/fsl,mxs-dma.yaml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,35 @@ allOf:
2323
properties:
2424
power-domains: false
2525

26+
- if:
27+
properties:
28+
compatible:
29+
contains:
30+
const: fsl,imx23-dma-apbx
31+
then:
32+
properties:
33+
interrupt-names:
34+
items:
35+
- const: audio-adc
36+
- const: audio-dac
37+
- const: spdif-tx
38+
- const: i2c
39+
- const: saif0
40+
- const: empty0
41+
- const: auart0-rx
42+
- const: auart0-tx
43+
- const: auart1-rx
44+
- const: auart1-tx
45+
- const: saif1
46+
- const: empty1
47+
- const: empty2
48+
- const: empty3
49+
- const: empty4
50+
- const: empty5
51+
else:
52+
properties:
53+
interrupt-names: false
54+
2655
properties:
2756
compatible:
2857
oneOf:
@@ -54,6 +83,10 @@ properties:
5483
minItems: 4
5584
maxItems: 16
5685

86+
interrupt-names:
87+
minItems: 4
88+
maxItems: 16
89+
5790
"#dma-cells":
5891
const: 1
5992

‎Documentation/devicetree/bindings/dma/marvell,orion-xor.yaml‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/dma/marvell,orion-xor.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Marvell XOR engine
8+
9+
maintainers:
10+
- Andrew Lunn <andrew@lunn.ch>
11+
- Gregory Clement <gregory.clement@bootlin.com>
12+
13+
properties:
14+
compatible:
15+
oneOf:
16+
- items:
17+
- const: marvell,armada-380-xor
18+
- const: marvell,orion-xor
19+
- enum:
20+
- marvell,armada-3700-xor
21+
- marvell,orion-xor
22+
23+
reg:
24+
items:
25+
- description: Low registers for the XOR engine
26+
- description: High registers for the XOR engine
27+
28+
clocks:
29+
maxItems: 1
30+
31+
patternProperties:
32+
"^(channel|xor)[0-9]+$":
33+
description: XOR channel sub-node
34+
type: object
35+
additionalProperties: false
36+
37+
properties:
38+
interrupts:
39+
description: Interrupt specifier for the XOR channel
40+
items:
41+
- description: Interrupt for this channel
42+
43+
dmacap,memcpy:
44+
type: boolean
45+
deprecated: true
46+
description:
47+
Indicates that the XOR channel is capable of memcpy operations
48+
49+
dmacap,memset:
50+
type: boolean
51+
deprecated: true
52+
description:
53+
Indicates that the XOR channel is capable of memset operations
54+
55+
dmacap,xor:
56+
type: boolean
57+
deprecated: true
58+
description:
59+
Indicates that the XOR channel is capable of xor operations
60+
61+
required:
62+
- interrupts
63+
64+
required:
65+
- compatible
66+
- reg
67+
68+
additionalProperties: false
69+
70+
examples:
71+
- |
72+
xor@d0060900 {
73+
compatible = "marvell,orion-xor";
74+
reg = <0xd0060900 0x100>,
75+
<0xd0060b00 0x100>;
76+
clocks = <&coreclk 0>;
77+
78+
xor00 {
79+
interrupts = <51>;
80+
};
81+
xor01 {
82+
interrupts = <52>;
83+
};
84+
};

‎Documentation/devicetree/bindings/dma/mv-xor.txt‎

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

‎Documentation/devicetree/bindings/dma/qcom,gpi.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@ properties:
2424
- qcom,sm6350-gpi-dma
2525
- items:
2626
- enum:
27+
- qcom,milos-gpi-dma
2728
- qcom,qcm2290-gpi-dma
2829
- qcom,qcs8300-gpi-dma
2930
- qcom,qdu1000-gpi-dma
3031
- qcom,sa8775p-gpi-dma
3132
- qcom,sar2130p-gpi-dma
3233
- qcom,sc7280-gpi-dma
34+
- qcom,sc8280xp-gpi-dma
3335
- qcom,sdx75-gpi-dma
3436
- qcom,sm6115-gpi-dma
3537
- qcom,sm6375-gpi-dma

‎Documentation/devicetree/bindings/dma/sophgo,cv1800b-dmamux.yaml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/dma/sophgo,cv1800b-dmamux.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Sophgo CV1800/SG200 Series DMA multiplexer
8+
9+
maintainers:
10+
- Inochi Amaoto <inochiama@gmail.com>
11+
12+
description:
13+
The DMA multiplexer of CV1800 is a subdevice of the system
14+
controller. It support mapping 8 channels, but each channel
15+
can be mapped only once.
16+
17+
allOf:
18+
- $ref: dma-router.yaml#
19+
20+
properties:
21+
compatible:
22+
const: sophgo,cv1800b-dmamux
23+
24+
reg:
25+
items:
26+
- description: DMA channal remapping register
27+
- description: DMA channel interrupt mapping register
28+
29+
'#dma-cells':
30+
const: 2
31+
description:
32+
The first cells is device id. The second one is the cpu id.
33+
34+
dma-masters:
35+
maxItems: 1
36+
37+
required:
38+
- reg
39+
- '#dma-cells'
40+
- dma-masters
41+
42+
additionalProperties: false
43+
44+
examples:
45+
- |
46+
dma-router@154 {
47+
compatible = "sophgo,cv1800b-dmamux";
48+
reg = <0x154 0x8>, <0x298 0x4>;
49+
#dma-cells = <2>;
50+
dma-masters = <&dmac>;
51+
};

‎drivers/dma/Kconfig‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ config APPLE_ADMAC
8989
tristate "Apple ADMAC support"
9090
depends on ARCH_APPLE || COMPILE_TEST
9191
select DMA_ENGINE
92-
default ARCH_APPLE
9392
help
9493
Enable support for Audio DMA Controller found on Apple Silicon SoCs.
9594

@@ -111,7 +110,7 @@ config AT_HDMAC
111110

112111
config AT_XDMAC
113112
tristate "Atmel XDMA support"
114-
depends on ARCH_AT91
113+
depends on ARCH_MICROCHIP
115114
select DMA_ENGINE
116115
help
117116
Support the Atmel XDMA controller.
@@ -572,6 +571,15 @@ config PLX_DMA
572571
These are exposed via extra functions on the switch's
573572
upstream port. Each function exposes one DMA channel.
574573

574+
config SOPHGO_CV1800B_DMAMUX
575+
tristate "Sophgo CV1800/SG2000 series SoC DMA multiplexer support"
576+
depends on MFD_SYSCON
577+
depends on ARCH_SOPHGO || COMPILE_TEST
578+
help
579+
Support for the DMA multiplexer on Sophgo CV1800/SG2000
580+
series SoCs.
581+
Say Y here if your board have this soc.
582+
575583
config STE_DMA40
576584
bool "ST-Ericsson DMA40 support"
577585
depends on ARCH_U8500

‎drivers/dma/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/
7171
obj-$(CONFIG_PXA_DMA) += pxa_dma.o
7272
obj-$(CONFIG_RENESAS_DMA) += sh/
7373
obj-$(CONFIG_SF_PDMA) += sf-pdma/
74+
obj-$(CONFIG_SOPHGO_CV1800B_DMAMUX) += cv1800b-dmamux.o
7475
obj-$(CONFIG_STE_DMA40) += ste_dma40.o ste_dma40_ll.o
7576
obj-$(CONFIG_SPRD_DMA) += sprd-dma.o
7677
obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o

0 commit comments

Comments
 (0)