diff mbox series

[v9,13/13] dt-bindings: fsl-dma: fsl-edma: add edma3 compatible string

Message ID 20230620201221.2580428-14-Frank.Li@nxp.com
State Not Applicable, archived
Headers show
Series dmaengine: edma: add freescale edma v3 support | expand

Checks

Context Check Description
robh/checkpatch success
robh/patch-applied success
robh/dtbs-check warning build log
robh/dt-meta-schema success

Commit Message

Frank Li June 20, 2023, 8:12 p.m. UTC 
Extend Freescale eDMA driver bindings to support eDMA3 IP blocks in
i.MX8QM and i.MX8QXP SoCs. In i.MX93, both eDMA3 and eDMA4 are now.

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 .../devicetree/bindings/dma/fsl,edma.yaml     | 106 ++++++++++++++++--
 1 file changed, 99 insertions(+), 7 deletions(-)

Comments

Vinod Koul July 7, 2023, 5:45 a.m. UTC | #1 
On 20-06-23, 16:12, Frank Li wrote:
> Extend Freescale eDMA driver bindings to support eDMA3 IP blocks in
> i.MX8QM and i.MX8QXP SoCs. In i.MX93, both eDMA3 and eDMA4 are now.

This should be patch before it use (which is 12th patch now right)

> 
> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> Signed-off-by: Frank Li <Frank.Li@nxp.com>
> ---
>  .../devicetree/bindings/dma/fsl,edma.yaml     | 106 ++++++++++++++++--
>  1 file changed, 99 insertions(+), 7 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/dma/fsl,edma.yaml b/Documentation/devicetree/bindings/dma/fsl,edma.yaml
> index 5fd8fc604261..437db0c62339 100644
> --- a/Documentation/devicetree/bindings/dma/fsl,edma.yaml
> +++ b/Documentation/devicetree/bindings/dma/fsl,edma.yaml
> @@ -21,32 +21,41 @@ properties:
>        - enum:
>            - fsl,vf610-edma
>            - fsl,imx7ulp-edma
> +          - fsl,imx8qm-adma
> +          - fsl,imx8qm-edma
> +          - fsl,imx93-edma3
> +          - fsl,imx93-edma4
>        - items:
>            - const: fsl,ls1028a-edma
>            - const: fsl,vf610-edma
>  
>    reg:
> -    minItems: 2
> +    minItems: 1
>      maxItems: 3
>  
>    interrupts:
> -    minItems: 2
> -    maxItems: 17
> +    minItems: 1
> +    maxItems: 64
>  
>    interrupt-names:
> -    minItems: 2
> -    maxItems: 17
> +    minItems: 1
> +    maxItems: 64
>  
>    "#dma-cells":
> -    const: 2
> +    enum:
> +      - 2
> +      - 3
>  
>    dma-channels:
> -    const: 32
> +    minItems: 1
> +    maxItems: 64
>  
>    clocks:
> +    minItems: 1
>      maxItems: 2
>  
>    clock-names:
> +    minItems: 1
>      maxItems: 2
>  
>    big-endian:
> @@ -65,6 +74,29 @@ required:
>  
>  allOf:
>    - $ref: dma-controller.yaml#
> +  - if:
> +      properties:
> +        compatible:
> +          contains:
> +            enum:
> +              - fsl,imx8qm-adma
> +              - fsl,imx8qm-edma
> +              - fsl,imx93-edma3
> +              - fsl,imx93-edma4
> +    then:
> +      properties:
> +        "#dma-cells":
> +          const: 3
> +        # It is not necessary to write the interrupt name for each channel.
> +        # instead, you can simply maintain the sequential IRQ numbers as
> +        # defined for the DMA channels.
> +        interrupt-names: false
> +        clock-names:
> +          items:
> +            - const: dma
> +        clocks:
> +          maxItems: 1
> +
>    - if:
>        properties:
>          compatible:
> @@ -72,18 +104,26 @@ allOf:
>              const: fsl,vf610-edma
>      then:
>        properties:
> +        clocks:
> +          minItems: 2
>          clock-names:
>            items:
>              - const: dmamux0
>              - const: dmamux1
>          interrupts:
> +          minItems: 2
>            maxItems: 2
>          interrupt-names:
>            items:
>              - const: edma-tx
>              - const: edma-err
>          reg:
> +          minItems: 2
>            maxItems: 3
> +        "#dma-cells":
> +          const: 2
> +        dma-channels:
> +          const: 32
>  
>    - if:
>        properties:
> @@ -92,14 +132,22 @@ allOf:
>              const: fsl,imx7ulp-edma
>      then:
>        properties:
> +        clock:
> +          minItems: 2
>          clock-names:
>            items:
>              - const: dma
>              - const: dmamux0
>          interrupts:
> +          minItems: 2
>            maxItems: 17
>          reg:
> +          minItems: 2
>            maxItems: 2
> +        "#dma-cells":
> +          const: 2
> +        dma-channels:
> +          const: 32
>  
>  unevaluatedProperties: false
>  
> @@ -153,3 +201,47 @@ examples:
>         clock-names = "dma", "dmamux0";
>         clocks = <&pcc2 IMX7ULP_CLK_DMA1>, <&pcc2 IMX7ULP_CLK_DMA_MUX1>;
>      };
> +
> +  - |
> +    #include <dt-bindings/interrupt-controller/arm-gic.h>
> +    #include <dt-bindings/clock/imx93-clock.h>
> +
> +    dma-controller@44000000 {
> +      compatible = "fsl,imx93-edma3";
> +      reg = <0x44000000 0x200000>;
> +      #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";
> +    };
> -- 
> 2.34.1
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/dma/fsl,edma.yaml b/Documentation/devicetree/bindings/dma/fsl,edma.yaml
index 5fd8fc604261..437db0c62339 100644
--- a/Documentation/devicetree/bindings/dma/fsl,edma.yaml
+++ b/Documentation/devicetree/bindings/dma/fsl,edma.yaml
@@ -21,32 +21,41 @@  properties:
       - enum:
           - fsl,vf610-edma
           - fsl,imx7ulp-edma
+          - fsl,imx8qm-adma
+          - fsl,imx8qm-edma
+          - fsl,imx93-edma3
+          - fsl,imx93-edma4
       - items:
           - const: fsl,ls1028a-edma
           - const: fsl,vf610-edma
 
   reg:
-    minItems: 2
+    minItems: 1
     maxItems: 3
 
   interrupts:
-    minItems: 2
-    maxItems: 17
+    minItems: 1
+    maxItems: 64
 
   interrupt-names:
-    minItems: 2
-    maxItems: 17
+    minItems: 1
+    maxItems: 64
 
   "#dma-cells":
-    const: 2
+    enum:
+      - 2
+      - 3
 
   dma-channels:
-    const: 32
+    minItems: 1
+    maxItems: 64
 
   clocks:
+    minItems: 1
     maxItems: 2
 
   clock-names:
+    minItems: 1
     maxItems: 2
 
   big-endian:
@@ -65,6 +74,29 @@  required:
 
 allOf:
   - $ref: dma-controller.yaml#
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - fsl,imx8qm-adma
+              - fsl,imx8qm-edma
+              - fsl,imx93-edma3
+              - fsl,imx93-edma4
+    then:
+      properties:
+        "#dma-cells":
+          const: 3
+        # It is not necessary to write the interrupt name for each channel.
+        # instead, you can simply maintain the sequential IRQ numbers as
+        # defined for the DMA channels.
+        interrupt-names: false
+        clock-names:
+          items:
+            - const: dma
+        clocks:
+          maxItems: 1
+
   - if:
       properties:
         compatible:
@@ -72,18 +104,26 @@  allOf:
             const: fsl,vf610-edma
     then:
       properties:
+        clocks:
+          minItems: 2
         clock-names:
           items:
             - const: dmamux0
             - const: dmamux1
         interrupts:
+          minItems: 2
           maxItems: 2
         interrupt-names:
           items:
             - const: edma-tx
             - const: edma-err
         reg:
+          minItems: 2
           maxItems: 3
+        "#dma-cells":
+          const: 2
+        dma-channels:
+          const: 32
 
   - if:
       properties:
@@ -92,14 +132,22 @@  allOf:
             const: fsl,imx7ulp-edma
     then:
       properties:
+        clock:
+          minItems: 2
         clock-names:
           items:
             - const: dma
             - const: dmamux0
         interrupts:
+          minItems: 2
           maxItems: 17
         reg:
+          minItems: 2
           maxItems: 2
+        "#dma-cells":
+          const: 2
+        dma-channels:
+          const: 32
 
 unevaluatedProperties: false
 
@@ -153,3 +201,47 @@  examples:
        clock-names = "dma", "dmamux0";
        clocks = <&pcc2 IMX7ULP_CLK_DMA1>, <&pcc2 IMX7ULP_CLK_DMA_MUX1>;
     };
+
+  - |
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+    #include <dt-bindings/clock/imx93-clock.h>
+
+    dma-controller@44000000 {
+      compatible = "fsl,imx93-edma3";
+      reg = <0x44000000 0x200000>;
+      #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";
+    };