[PATCH] spi: dt-bindings: cdns,qspi-nor: Update minItems/maxItems of resets for Cadence OSPI controller

[PATCH] spi: dt-bindings: cdns,qspi-nor: Update minItems/maxItems of resets for Cadence OSPI controller

[Amit Kumar Mahapatra]

The Cadence Octal SPI (OSPI) controller on AMD Versal SoCs requires only
one reset entry. To reflect this, the maxItems for "resets" and
"reset-names" has been set to 1 for AMD Versal SoCs, and the minItems for
these properties has also been updated to 1. Additionally, these properties
have been added to the required property list for Versal SoCs.

Signed-off-by: Amit Kumar Mahapatra <amit.kumar-mahapatra@amd.com>
---
BRANCH: mtd/next
---
 .../devicetree/bindings/spi/cdns,qspi-nor.yaml     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml b/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml
index d48ecd6cd5ad..cc94c59280a1 100644
--- a/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml
+++ b/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml
@@ -17,8 +17,18 @@ allOf:
           contains:
             const: xlnx,versal-ospi-1.0
     then:
+      properties:
+        resets:
+          maxItems: 1
+
+        reset-names:
+          maxItems: 1
+          items:
+            enum: [ qspi ]
       required:
         - power-domains
+        - resets
+        - reset-names
   - if:
       properties:
         compatible:
@@ -132,11 +142,11 @@ properties:
     maxItems: 1
 
   resets:
-    minItems: 2
+    minItems: 1
     maxItems: 3
 
   reset-names:
-    minItems: 2
+    minItems: 1
     maxItems: 3
     items:
       enum: [ qspi, qspi-ocp, rstc_ref ]
-- 
2.34.1

Re: [PATCH] spi: dt-bindings: cdns,qspi-nor: Update minItems/maxItems of resets for Cadence OSPI controller

[Krzysztof Kozlowski]

On 26/03/2025 12:37, Amit Kumar Mahapatra wrote:
> The Cadence Octal SPI (OSPI) controller on AMD Versal SoCs requires only
> one reset entry. To reflect this, the maxItems for "resets" and
> "reset-names" has been set to 1 for AMD Versal SoCs, and the minItems for
> these properties has also been updated to 1. Additionally, these properties
> have been added to the required property list for Versal SoCs.
> 
> Signed-off-by: Amit Kumar Mahapatra <amit.kumar-mahapatra@amd.com>
> ---
> BRANCH: mtd/next
> ---
>  .../devicetree/bindings/spi/cdns,qspi-nor.yaml     | 14 ++++++++++++--
>  1 file changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml b/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml
> index d48ecd6cd5ad..cc94c59280a1 100644
> --- a/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml
> +++ b/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml
> @@ -17,8 +17,18 @@ allOf:
>            contains:
>              const: xlnx,versal-ospi-1.0
>      then:
> +      properties:
> +        resets:
> +          maxItems: 1
> +
> +        reset-names:
> +          maxItems: 1
> +          items:
> +            enum: [ qspi ]

Just list the items instead of these three lines.

>        required:
>          - power-domains
> +        - resets
> +        - reset-names

Why? That's an ABI break.


>    - if:
>        properties:
>          compatible:
> @@ -132,11 +142,11 @@ properties:
>      maxItems: 1
>  
>    resets:
> -    minItems: 2
> +    minItems: 1

You need to update other variants now.

Best regards,
Krzysztof

RE: [PATCH] spi: dt-bindings: cdns,qspi-nor: Update minItems/maxItems of resets for Cadence OSPI controller

[Mahapatra, Amit Kumar]

[AMD Official Use Only - AMD Internal Distribution Only]

Hello Krzysztof,

> -----Original Message-----
> From: Krzysztof Kozlowski <krzk@kernel.org>
> Sent: Wednesday, March 26, 2025 5:51 PM
> To: Mahapatra, Amit Kumar <amit.kumar-mahapatra@amd.com>;
> broonie@kernel.org; robh@kernel.org; krzk+dt@kernel.org; conor+dt@kernel.org
> Cc: linux-spi@vger.kernel.org; devicetree@vger.kernel.org; linux-
> kernel@vger.kernel.org; git (AMD-Xilinx) <git@amd.com>;
> amitrkcian2002@gmail.com
> Subject: Re: [PATCH] spi: dt-bindings: cdns,qspi-nor: Update minItems/maxItems of
> resets for Cadence OSPI controller
>
> On 26/03/2025 12:37, Amit Kumar Mahapatra wrote:
> > The Cadence Octal SPI (OSPI) controller on AMD Versal SoCs requires
> > only one reset entry. To reflect this, the maxItems for "resets" and
> > "reset-names" has been set to 1 for AMD Versal SoCs, and the minItems
> > for these properties has also been updated to 1. Additionally, these
> > properties have been added to the required property list for Versal SoCs.
> >
> > Signed-off-by: Amit Kumar Mahapatra <amit.kumar-mahapatra@amd.com>
> > ---
> > BRANCH: mtd/next
> > ---
> >  .../devicetree/bindings/spi/cdns,qspi-nor.yaml     | 14 ++++++++++++--
> >  1 file changed, 12 insertions(+), 2 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml
> > b/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml
> > index d48ecd6cd5ad..cc94c59280a1 100644
> > --- a/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml
> > +++ b/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml
> > @@ -17,8 +17,18 @@ allOf:
> >            contains:
> >              const: xlnx,versal-ospi-1.0
> >      then:
> > +      properties:
> > +        resets:
> > +          maxItems: 1
> > +
> > +        reset-names:
> > +          maxItems: 1
> > +          items:
> > +            enum: [ qspi ]
>
> Just list the items instead of these three lines.

Do you mean something like this?
        reset-names:
          items:
            - const: [ qspi ]
>
> >        required:
> >          - power-domains
> > +        - resets
> > +        - reset-names
>
> Why? That's an ABI break.

Went through the driver, and believe these properties do not need to be in
the required list. I will revert this change in my next series.
>
>
> >    - if:
> >        properties:
> >          compatible:
> > @@ -132,11 +142,11 @@ properties:
> >      maxItems: 1
> >
> >    resets:
> > -    minItems: 2
> > +    minItems: 1
>
> You need to update other variants now.

Are you referring to other SoCs when you mention other variants?

Regards,
Amit
>
> Best regards,
> Krzysztof