[3/9] dt-bindings: crypto: fsl-sec4: support sec5.4/0 and i.MX6UL

Message ID 20230301015702.3388458-4-peng.fan@oss.nxp.com
State New
Headers
Series dt-bindings: crypto: convert fsl-sec4 to DT schema |

Commit Message

Peng Fan (OSS) March 1, 2023, 1:56 a.m. UTC
  From: Peng Fan <peng.fan@nxp.com>

Add i.MX6UL, SEC 5.0 and SEC 5.4 support.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 .../devicetree/bindings/crypto/fsl-sec4.yaml  | 58 ++++++++++++++++---
 1 file changed, 50 insertions(+), 8 deletions(-)
  

Comments

Krzysztof Kozlowski March 3, 2023, 9:55 a.m. UTC | #1
On 01/03/2023 02:56, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan@nxp.com>
> 
> Add i.MX6UL, SEC 5.0 and SEC 5.4 support.
> 
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
>  .../devicetree/bindings/crypto/fsl-sec4.yaml  | 58 ++++++++++++++++---
>  1 file changed, 50 insertions(+), 8 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/crypto/fsl-sec4.yaml b/Documentation/devicetree/bindings/crypto/fsl-sec4.yaml
> index 678c8389ef49..1b801ae5ab51 100644
> --- a/Documentation/devicetree/bindings/crypto/fsl-sec4.yaml
> +++ b/Documentation/devicetree/bindings/crypto/fsl-sec4.yaml
> @@ -45,8 +45,18 @@ maintainers:
>  
>  properties:
>    compatible:
> -    enum:
> -      - fsl,sec-v4.0
> +    oneOf:
> +      - enum:
> +          - fsl,sec-v4.0
> +      - items:
> +          - enum:
> +              - fsl,imx6ul-caam
> +              - fsl,sec-v5.0
> +          - const: fsl,sec-v4.0
> +      - items:
> +          - const: fsl,sec-v5.4
> +          - const: fsl,sec-v5.0

What's the point of having all these versions? Better to use
SoC-compatibles.

> +          - const: fsl,sec-v4.0
>  
>    "#address-cells":
>      const: 1
> @@ -77,6 +87,8 @@ properties:
>  
>    clock-names:
>      oneOf:
> +      - items:
> +          - const: ipg
>        - items:
>            - const: mem
>            - const: aclk
> @@ -85,11 +97,17 @@ properties:
>        - items:
>            - const: aclk
>            - const: ipg
> +      - items:
> +          - const: ipg
> +          - const: aclk
>        - items:
>            - const: ipg
>            - const: aclk
>            - const: mem
>  
> +  dma-coherent:
> +    type: boolean
> +
>    fsl,sec-era:
>      description:
>        Optional. A standard property. Define the 'ERA' of the SEC device.
> @@ -108,8 +126,16 @@ patternProperties:
>  
>      properties:
>        compatible:
> -        enum:
> -          - fsl,sec-v4.0-job-ring
> +        oneOf:
> +          - enum:
> +              - fsl,sec-v4.0-job-ring
> +          - items:
> +              - const: fsl,sec-v5.0-job-ring
> +              - const: fsl,sec-v4.0-job-ring
> +          - items:
> +              - const: fsl,sec-v5.4-job-ring
> +              - const: fsl,sec-v5.0-job-ring
> +              - const: fsl,sec-v4.0-job-ring
>  
>        reg:
>          maxItems: 1
> @@ -148,8 +174,16 @@ patternProperties:
>  
>      properties:
>        compatible:
> -        enum:
> -          - fsl,sec-v4.0-rtic
> +        oneOf:
> +          - enum:
> +              - fsl,sec-v4.0-rtic
> +          - items:
> +              - const: fsl,sec-v5.0-rtic
> +              - const: fsl,sec-v4.0-rtic
> +          - items:
> +              - const: fsl,sec-v5.4-rtic
> +              - const: fsl,sec-v5.0-rtic
> +              - const: fsl,sec-v4.0-rtic

This is also a bit odd... why do you version children?

Best regards,
Krzysztof
  
Gaurav Jain March 7, 2023, 6:56 a.m. UTC | #2
> -----Original Message-----
> From: Peng Fan (OSS) <peng.fan@oss.nxp.com>
> Sent: Wednesday, March 1, 2023 7:27 AM
> To: herbert@gondor.apana.org.au; davem@davemloft.net;
> robh+dt@kernel.org; krzysztof.kozlowski+dt@linaro.org; Horia Geanta
> <horia.geanta@nxp.com>; Pankaj Gupta <pankaj.gupta@nxp.com>; Gaurav Jain
> <gaurav.jain@nxp.com>; shawnguo@kernel.org; s.hauer@pengutronix.de
> Cc: kernel@pengutronix.de; stefan@agner.ch; linux-crypto@vger.kernel.org;
> devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; linux-arm-
> kernel@lists.infradead.org; Peng Fan <peng.fan@nxp.com>
> Subject: [PATCH 3/9] dt-bindings: crypto: fsl-sec4: support sec5.4/0 and i.MX6UL
> 
> From: Peng Fan <peng.fan@nxp.com>
> 
> Add i.MX6UL, SEC 5.0 and SEC 5.4 support.
> 
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
>  .../devicetree/bindings/crypto/fsl-sec4.yaml  | 58 ++++++++++++++++---
>  1 file changed, 50 insertions(+), 8 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/crypto/fsl-sec4.yaml
> b/Documentation/devicetree/bindings/crypto/fsl-sec4.yaml
> index 678c8389ef49..1b801ae5ab51 100644
> --- a/Documentation/devicetree/bindings/crypto/fsl-sec4.yaml
> +++ b/Documentation/devicetree/bindings/crypto/fsl-sec4.yaml
> @@ -45,8 +45,18 @@ maintainers:
> 
>  properties:
>    compatible:
> -    enum:
> -      - fsl,sec-v4.0
> +    oneOf:
> +      - enum:
> +          - fsl,sec-v4.0
> +      - items:
> +          - enum:
> +              - fsl,imx6ul-caam
> +              - fsl,sec-v5.0
> +          - const: fsl,sec-v4.0
> +      - items:
> +          - const: fsl,sec-v5.4
> +          - const: fsl,sec-v5.0
> +          - const: fsl,sec-v4.0

fsl,sec-v5.2, fsl,sec-v5.3, fsl,sec-v6.0 also used in Qoriq

regards
Gaurav 
> 
>    "#address-cells":
>      const: 1
> @@ -77,6 +87,8 @@ properties:
> 
>    clock-names:
>      oneOf:
> +      - items:
> +          - const: ipg
>        - items:
>            - const: mem
>            - const: aclk
> @@ -85,11 +97,17 @@ properties:
>        - items:
>            - const: aclk
>            - const: ipg
> +      - items:
> +          - const: ipg
> +          - const: aclk
>        - items:
>            - const: ipg
>            - const: aclk
>            - const: mem
> 
> +  dma-coherent:
> +    type: boolean
> +
>    fsl,sec-era:
>      description:
>        Optional. A standard property. Define the 'ERA' of the SEC device.
> @@ -108,8 +126,16 @@ patternProperties:
> 
>      properties:
>        compatible:
> -        enum:
> -          - fsl,sec-v4.0-job-ring
> +        oneOf:
> +          - enum:
> +              - fsl,sec-v4.0-job-ring
> +          - items:
> +              - const: fsl,sec-v5.0-job-ring
> +              - const: fsl,sec-v4.0-job-ring
> +          - items:
> +              - const: fsl,sec-v5.4-job-ring
> +              - const: fsl,sec-v5.0-job-ring
> +              - const: fsl,sec-v4.0-job-ring
> 
>        reg:
>          maxItems: 1
> @@ -148,8 +174,16 @@ patternProperties:
> 
>      properties:
>        compatible:
> -        enum:
> -          - fsl,sec-v4.0-rtic
> +        oneOf:
> +          - enum:
> +              - fsl,sec-v4.0-rtic
> +          - items:
> +              - const: fsl,sec-v5.0-rtic
> +              - const: fsl,sec-v4.0-rtic
> +          - items:
> +              - const: fsl,sec-v5.4-rtic
> +              - const: fsl,sec-v5.0-rtic
> +              - const: fsl,sec-v4.0-rtic
> 
>        "#address-cells":
>          const: 1
> @@ -187,8 +221,16 @@ patternProperties:
> 
>          properties:
>            compatible:
> -            enum:
> -              - fsl,sec-v4.0-rtic-memory
> +            oneOf:
> +              - enum:
> +                  - fsl,sec-v4.0-rtic-memory
> +              - items:
> +                  - const: fsl,sec-v5.0-rtic-memory
> +                  - const: fsl,sec-v4.0-rtic-memory
> +              - items:
> +                  - const: fsl,sec-v5.4-rtic-memory
> +                  - const: fsl,sec-v5.0-rtic-memory
> +                  - const: fsl,sec-v4.0-rtic-memory
> 
>            reg:
>              minItems: 1
> --
> 2.37.1
  

Patch

diff --git a/Documentation/devicetree/bindings/crypto/fsl-sec4.yaml b/Documentation/devicetree/bindings/crypto/fsl-sec4.yaml
index 678c8389ef49..1b801ae5ab51 100644
--- a/Documentation/devicetree/bindings/crypto/fsl-sec4.yaml
+++ b/Documentation/devicetree/bindings/crypto/fsl-sec4.yaml
@@ -45,8 +45,18 @@  maintainers:
 
 properties:
   compatible:
-    enum:
-      - fsl,sec-v4.0
+    oneOf:
+      - enum:
+          - fsl,sec-v4.0
+      - items:
+          - enum:
+              - fsl,imx6ul-caam
+              - fsl,sec-v5.0
+          - const: fsl,sec-v4.0
+      - items:
+          - const: fsl,sec-v5.4
+          - const: fsl,sec-v5.0
+          - const: fsl,sec-v4.0
 
   "#address-cells":
     const: 1
@@ -77,6 +87,8 @@  properties:
 
   clock-names:
     oneOf:
+      - items:
+          - const: ipg
       - items:
           - const: mem
           - const: aclk
@@ -85,11 +97,17 @@  properties:
       - items:
           - const: aclk
           - const: ipg
+      - items:
+          - const: ipg
+          - const: aclk
       - items:
           - const: ipg
           - const: aclk
           - const: mem
 
+  dma-coherent:
+    type: boolean
+
   fsl,sec-era:
     description:
       Optional. A standard property. Define the 'ERA' of the SEC device.
@@ -108,8 +126,16 @@  patternProperties:
 
     properties:
       compatible:
-        enum:
-          - fsl,sec-v4.0-job-ring
+        oneOf:
+          - enum:
+              - fsl,sec-v4.0-job-ring
+          - items:
+              - const: fsl,sec-v5.0-job-ring
+              - const: fsl,sec-v4.0-job-ring
+          - items:
+              - const: fsl,sec-v5.4-job-ring
+              - const: fsl,sec-v5.0-job-ring
+              - const: fsl,sec-v4.0-job-ring
 
       reg:
         maxItems: 1
@@ -148,8 +174,16 @@  patternProperties:
 
     properties:
       compatible:
-        enum:
-          - fsl,sec-v4.0-rtic
+        oneOf:
+          - enum:
+              - fsl,sec-v4.0-rtic
+          - items:
+              - const: fsl,sec-v5.0-rtic
+              - const: fsl,sec-v4.0-rtic
+          - items:
+              - const: fsl,sec-v5.4-rtic
+              - const: fsl,sec-v5.0-rtic
+              - const: fsl,sec-v4.0-rtic
 
       "#address-cells":
         const: 1
@@ -187,8 +221,16 @@  patternProperties:
 
         properties:
           compatible:
-            enum:
-              - fsl,sec-v4.0-rtic-memory
+            oneOf:
+              - enum:
+                  - fsl,sec-v4.0-rtic-memory
+              - items:
+                  - const: fsl,sec-v5.0-rtic-memory
+                  - const: fsl,sec-v4.0-rtic-memory
+              - items:
+                  - const: fsl,sec-v5.4-rtic-memory
+                  - const: fsl,sec-v5.0-rtic-memory
+                  - const: fsl,sec-v4.0-rtic-memory
 
           reg:
             minItems: 1