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

[PATCH v2] 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.

Signed-off-by: Amit Kumar Mahapatra <amit.kumar-mahapatra@amd.com>
---
BRANCH: mtd/next

Changes in v2:
 - Removed "resets" & "reset-names" from required properties.
 - To address review comments, removed "maxItems" from "reset-names".
---
 .../devicetree/bindings/spi/cdns,qspi-nor.yaml        | 11 +++++++++--
 1 file changed, 9 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..648b8452877c 100644
--- a/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml
+++ b/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml
@@ -17,6 +17,13 @@ allOf:
           contains:
             const: xlnx,versal-ospi-1.0
     then:
+      properties:
+        resets:
+          maxItems: 1
+
+        reset-names:
+          items:
+            enum: [ qspi ]
       required:
         - power-domains
   - if:
@@ -132,11 +139,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 v2] spi: dt-bindings: cdns,qspi-nor: Update minItems/maxItems of resets for Cadence OSPI controller

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 377 bytes --]

On Thu, May 22, 2025 at 04:17:45PM +0530, 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.

Acked-by: Mark Brown <broonie@kernel.org>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 1849 bytes --]

On Thu, May 22, 2025 at 04:17:45PM +0530, 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.
> 
> Signed-off-by: Amit Kumar Mahapatra <amit.kumar-mahapatra@amd.com>
> ---
> BRANCH: mtd/next
> 
> Changes in v2:
>  - Removed "resets" & "reset-names" from required properties.
>  - To address review comments, removed "maxItems" from "reset-names".
> ---
>  .../devicetree/bindings/spi/cdns,qspi-nor.yaml        | 11 +++++++++--
>  1 file changed, 9 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..648b8452877c 100644
> --- a/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml
> +++ b/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml
> @@ -17,6 +17,13 @@ allOf:
>            contains:
>              const: xlnx,versal-ospi-1.0
>      then:
> +      properties:
> +        resets:
> +          maxItems: 1
> +
> +        reset-names:
> +          items:
> +            enum: [ qspi ]
>        required:
>          - power-domains
>    - if:
> @@ -132,11 +139,11 @@ properties:
>      maxItems: 1
>  
>    resets:
> -    minItems: 2
> +    minItems: 1

I think you're still missing one of the things Krzysztof requested on
v1, cos you reduce minItems for all platforms without restricting
it back to 2 for non-versal platforms.

>      maxItems: 3
>  
>    reset-names:
> -    minItems: 2
> +    minItems: 1
>      maxItems: 3
>      items:
>        enum: [ qspi, qspi-ocp, rstc_ref ]
> -- 
> 2.34.1
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

RE: [PATCH v2] 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]

> Subject: Re: [PATCH v2] spi: dt-bindings: cdns,qspi-nor: Update minItems/maxItems
> of resets for Cadence OSPI controller
>
> On Thu, May 22, 2025 at 04:17:45PM +0530, 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.
> >
> > Signed-off-by: Amit Kumar Mahapatra <amit.kumar-mahapatra@amd.com>
> > ---
> > BRANCH: mtd/next
> >
> > Changes in v2:
> >  - Removed "resets" & "reset-names" from required properties.
> >  - To address review comments, removed "maxItems" from "reset-names".
> > ---
> >  .../devicetree/bindings/spi/cdns,qspi-nor.yaml        | 11 +++++++++--
> >  1 file changed, 9 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..648b8452877c 100644
> > --- a/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml
> > +++ b/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml
> > @@ -17,6 +17,13 @@ allOf:
> >            contains:
> >              const: xlnx,versal-ospi-1.0
> >      then:
> > +      properties:
> > +        resets:
> > +          maxItems: 1
> > +
> > +        reset-names:
> > +          items:
> > +            enum: [ qspi ]
> >        required:
> >          - power-domains
> >    - if:
> > @@ -132,11 +139,11 @@ properties:
> >      maxItems: 1
> >
> >    resets:
> > -    minItems: 2
> > +    minItems: 1
>
> I think you're still missing one of the things Krzysztof requested on v1, cos you
> reduce minItems for all platforms without restricting it back to 2 for non-versal
> platforms.

I believe we can remove the "resets" and corresponding "reset-names"
properties from here, as their default minItems/maxItems are already
taken care of in the else block [1].

[1] https://github.com/torvalds/linux/blob/0ff41df1cb268fc69e703a08a57ee14ae967d0ca/Documentation/devicetree/bindings/spi/cdns%2Cqspi-nor.yaml#L39

Regards,
Amit
>
> >      maxItems: 3
> >
> >    reset-names:
> > -    minItems: 2
> > +    minItems: 1
> >      maxItems: 3
> >      items:
> >        enum: [ qspi, qspi-ocp, rstc_ref ]
> > --
> > 2.34.1
> >

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

[Krzysztof Kozlowski]

On 26/05/2025 09:07, Mahapatra, Amit Kumar wrote:
>>>    - if:
>>> @@ -132,11 +139,11 @@ properties:
>>>      maxItems: 1
>>>
>>>    resets:
>>> -    minItems: 2
>>> +    minItems: 1
>>
>> I think you're still missing one of the things Krzysztof requested on v1, cos you
>> reduce minItems for all platforms without restricting it back to 2 for non-versal
>> platforms.
> 
> I believe we can remove the "resets" and corresponding "reset-names"
> properties from here, as their default minItems/maxItems are already
> taken care of in the else block [1].
> 
> [1] https://github.com/torvalds/linux/blob/0ff41df1cb268fc69e703a08a57ee14ae967d0ca/Documentation/devicetree/bindings/spi/cdns%2Cqspi-nor.yaml#L39
I don't see anything fixed there.

Best regards,
Krzysztof

RE: [PATCH v2] 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]

> Subject: Re: [PATCH v2] spi: dt-bindings: cdns,qspi-nor: Update minItems/maxItems
> of resets for Cadence OSPI controller
>
> On 26/05/2025 09:07, Mahapatra, Amit Kumar wrote:
> >>>    - if:
> >>> @@ -132,11 +139,11 @@ properties:
> >>>      maxItems: 1
> >>>
> >>>    resets:
> >>> -    minItems: 2
> >>> +    minItems: 1
> >>
> >> I think you're still missing one of the things Krzysztof requested on
> >> v1, cos you reduce minItems for all platforms without restricting it
> >> back to 2 for non-versal platforms.
> >
> > I believe we can remove the "resets" and corresponding "reset-names"
> > properties from here, as their default minItems/maxItems are already
> > taken care of in the else block [1].
> >
> > [1]
> > https://github.com/torvalds/linux/blob/0ff41df1cb268fc69e703a08a57ee14
> > ae967d0ca/Documentation/devicetree/bindings/spi/cdns%2Cqspi-nor.yaml#L
> > 39
> I don't see anything fixed there.

The intention was to point out the redundancy related to the 'resets' and
'reset-names' properties. At [1], the default minItems and maxItems values
are already defined for all platforms. However, the same constraints are
redefined at [2] with different minItems and maxItems values , again
applying to all platforms. Based on my understanding, the definitions at
[2] for 'resets' and the corresponding 'reset-names' can be safely
removed.

[1] https://github.com/torvalds/linux/blob/0ff41df1cb268fc69e703a08a57ee14ae967d0ca/Documentation/devicetree/bindings/spi/cdns%2Cqspi-nor.yaml#L41
[2] https://github.com/torvalds/linux/blob/0ff41df1cb268fc69e703a08a57ee14ae967d0ca/Documentation/devicetree/bindings/spi/cdns%2Cqspi-nor.yaml#L139

Regards,
Amit

>
> Best regards,
> Krzysztof

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

[Krzysztof Kozlowski]

On 27/05/2025 08:05, Mahapatra, Amit Kumar wrote:
> [AMD Official Use Only - AMD Internal Distribution Only]
> 
>> Subject: Re: [PATCH v2] spi: dt-bindings: cdns,qspi-nor: Update minItems/maxItems
>> of resets for Cadence OSPI controller
>>
>> On 26/05/2025 09:07, Mahapatra, Amit Kumar wrote:
>>>>>    - if:
>>>>> @@ -132,11 +139,11 @@ properties:
>>>>>      maxItems: 1
>>>>>
>>>>>    resets:
>>>>> -    minItems: 2
>>>>> +    minItems: 1
>>>>
>>>> I think you're still missing one of the things Krzysztof requested on
>>>> v1, cos you reduce minItems for all platforms without restricting it
>>>> back to 2 for non-versal platforms.
>>>
>>> I believe we can remove the "resets" and corresponding "reset-names"
>>> properties from here, as their default minItems/maxItems are already
>>> taken care of in the else block [1].
>>>
>>> [1]
>>> https://github.com/torvalds/linux/blob/0ff41df1cb268fc69e703a08a57ee14
>>> ae967d0ca/Documentation/devicetree/bindings/spi/cdns%2Cqspi-nor.yaml#L
>>> 39
>> I don't see anything fixed there.
> 
> The intention was to point out the redundancy related to the 'resets' and
> 'reset-names' properties. At [1], the default minItems and maxItems values
> are already defined for all platforms. However, the same constraints are
> redefined at [2] with different minItems and maxItems values , again
> applying to all platforms. Based on my understanding, the definitions at
> [2] for 'resets' and the corresponding 'reset-names' can be safely
> removed.
It is not about redefining. You need to constrain your properties. They
have to be fixed, not flexible.

Best regards,
Krzysztof