dt-bindings: dma: fsl-edma: remove 'clocks' from required
Frank Li
maintainerPATCH v4 1/2 dt-bindings: dma: fsl-edma: remove 'clocks' from required
fsl,imx8qm-adma and fsl,imx8qm-edma don't require 'clocks'. Remove it from required and add 'if' block for other compatible string to keep the same restrictions.
---
Notes:
Change from v3 to v4
- fixed '\t' during fix conflicts.
make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- -j8 dt_binding_check DT_SCHEMA_FILES=fsl,edma.yaml
LINT Documentation/devicetree/bindings
DTEX Documentation/devicetree/bindings/dma/fsl,edma.example.dts
CHKDT Documentation/devicetree/bindings/processed-schema.json
SCHEMA Documentation/devicetree/bindings/processed-schema.json
DTC_CHK Documentation/devicetree/bindings/dma/fsl,edma.example.dtb
Change from v2 to v3
- rebase to dmaengine/next, fixed conflicts
Change from v1 to v2
- add Krzysztof's ACK.
.../devicetree/bindings/dma/fsl,edma.yaml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/dma/fsl,edma.yaml +16 -1
@@ -82,7 +82,6 @@ required: - compatible - reg - interrupts - - clocks - dma-channels allOf:
@@ -187,6 +186,22 @@ allOf: "#dma-cells": const: 3 + - if: + properties: + compatible: + contains: + enum: + - fsl,vf610-edma + - fsl,imx7ulp-edma + - fsl,imx93-edma3 + - fsl,imx93-edma4 + - fsl,imx95-edma5 + - fsl,imx8ulp-edma + - fsl,ls1028a-edma + then: + required: + - clocks + unevaluatedProperties: false examples:
Signature · 1 line
2.34.1
Frank Li
maintainerPATCH v4 2/2 dt-bindings: dma: fsl-edma: allow 'power-domains' property
Allow 'power-domains' property because i.MX8DXL i.MX8QM and i.MX8QXP need it. EDMA supports each power-domain for each dma channel. So minItems and maxItems align 'dma-channels'.
Change fsl,imx93-edma3 example to fsl,imx8qm-edma to reflect this variants.
Fixed below DTB_CHECK warning:
dma-controller@599f0000: Unevaluated properties are not allowed ('power-domains' was unexpected)
---
Notes:
Change from v3 to v4
- Remove 'contains' change should be belong to first patch when rebase.
make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- -j8 dt_binding_check DT_SCHEMA_FILES=fsl,edma.yaml
LINT Documentation/devicetree/bindings
DTEX Documentation/devicetree/bindings/dma/fsl,edma.example.dts
CHKDT Documentation/devicetree/bindings/processed-schema.json
SCHEMA Documentation/devicetree/bindings/processed-schema.json
DTC_CHK Documentation/devicetree/bindings/dma/fsl,edma.example.dtb
After this patch no warning for imx8dxl-evk.dtb.
touch arch/arm64/boot/dts/freescale/imx8dxl.dtsi
make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- -j8 CHECK_DTBS=y freescale/imx8dxl-evk.dtb
DTC_CHK arch/arm64/boot/dts/freescale/imx8dxl-evk.dtb
Change from v2 to v3
- set 'power-domains' false for other compatitble string
- change imx93 example to 8qm example to affect this change according to Krzysztof Kozlowski's suggestion, choose least channel number edma instance to reduce code copy. max channel number is 64.
- Rebase to latest dmaengine/next, fixes conflicts.
Change from v1 to v2
- using maxitem: 64. Each channel have one power domain. Max 64 dmachannel.
- add power-domains to 'required' when compatible string is fsl,imx8qm-adma or fsl,imx8qm-edma
.../devicetree/bindings/dma/fsl,edma.yaml | 77 ++++++++++--------- 1 file changed, 39 insertions(+), 38 deletions(-)
Documentation/devicetree/bindings/dma/fsl,edma.yaml +39 -38
@@ -71,6 +71,10 @@ properties: minItems: 1 maxItems: 33 + power-domains: + minItems: 1 + maxItems: 64 + big-endian: description: | If present registers and hardware scatter/gather descriptors of the
@@ -202,6 +206,20 @@ allOf: required: - clocks + - if: + properties: + compatible: + contains: + enum: + - fsl,imx8qm-adma + - fsl,imx8qm-edma + then: + required: + - power-domains + else: + properties: + power-domains: false + unevaluatedProperties: false examples:
@@ -257,44 +275,27 @@ examples: - | #include <dt-bindings/interrupt-controller/arm-gic.h> - #include <dt-bindings/clock/imx93-clock.h> + #include <dt-bindings/firmware/imx/rsrc.h> - dma-controller@44000000 { - compatible = "fsl,imx93-edma3"; - reg = <0x44000000 0x200000>; + dma-controller@5a9f0000 { + compatible = "fsl,imx8qm-edma"; + reg = <0x5a9f0000 0x90000>; #dma-cells = <3>; - dma-channels = <31>; - interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clk IMX93_CLK_EDMA1_GATE>; - clock-names = "dma"; + dma-channels = <8>; + interrupts = <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 427 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 428 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 429 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 431 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&pd IMX_SC_R_DMA_3_CH0>, + <&pd IMX_SC_R_DMA_3_CH1>, + <&pd IMX_SC_R_DMA_3_CH2>, + <&pd IMX_SC_R_DMA_3_CH3>, + <&pd IMX_SC_R_DMA_3_CH4>, + <&pd IMX_SC_R_DMA_3_CH5>, + <&pd IMX_SC_R_DMA_3_CH6>, + <&pd IMX_SC_R_DMA_3_CH7>; };
Signature · 1 line
2.34.1
Rob Herring
maintainerRe: [PATCH v4 2/2] dt-bindings: dma: fsl-edma: allow 'power-domains' property
Quoted 50 lines · Frank Li
Allow 'power-domains' property because i.MX8DXL i.MX8QM and i.MX8QXP need it. EDMA supports each power-domain for each dma channel. So minItems and maxItems align 'dma-channels'.
Change fsl,imx93-edma3 example to fsl,imx8qm-edma to reflect this variants.
Fixed below
DTB_CHECKwarning:
dma-controller@599f0000: Unevaluated properties are not allowed ('power-domains' was unexpected)Signed-off-by Frank Li <[email protected]>---
Notes:
Change from v3 to v4
- Remove 'contains' change should be belong to first patch when rebase.make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- -j8
dt_binding_checkDT_SCHEMA_FILES=fsl,edma.yaml
LINTDocumentation/devicetree/bindings
DTEXDocumentation/devicetree/bindings/dma/fsl,edma.example.dts
CHKDTDocumentation/devicetree/bindings/processed-schema.json
SCHEMADocumentation/devicetree/bindings/processed-schema.json
DTC_CHKDocumentation/devicetree/bindings/dma/fsl,edma.example.dtbAfter this patch no warning for imx8dxl-evk.dtb.
touch
arch/arm64/boot/dts/freescale/imx8dxl.dtsi
make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- -j8 CHECK_DTBS=y freescale/imx8dxl-evk.dtb
DTC_CHKarch/arm64/boot/dts/freescale/imx8dxl-evk.dtbChange from v2 to v3
- set 'power-domains' false for other compatitble string
- change imx93 example to 8qm example to affect this change according to Krzysztof Kozlowski's suggestion, choose least channel number edma instance to reduce code copy. max channel number is 64.- Rebase to latest dmaengine/next, fixes conflicts.
Change from v1 to v2
- using maxitem: 64. Each channel have one power domain. Max 64 dmachannel.
- add power-domains to 'required' when compatible string is fsl,imx8qm-adma or fsl,imx8qm-edma.../devicetree/bindings/dma/fsl,edma.yaml | 77 ++++++++++--------- 1 file changed, 39 insertions(+), 38 deletions(-)Documentation/devicetree/bindings/dma/fsl,edma.yaml +0
-0
Documentation/devicetree/bindings/dma/fsl,edma.yaml properties: · line 76
Quoted 6 lines
Documentation/devicetree/bindings/dma/fsl,edma.yaml +3
-0@@ -71,6 +71,10 @@ properties: minItems: 1 maxItems: 33 + power-domains: + minItems: 1 + maxItems: 64
Please state here that number of power-domains are equal to number of channels and in ascending order.
Rob