diff mbox series

[v7,1/4] spi: dt-bindings: cadence: Add Marvell overlay bindings documentation for Cadence XSPI

Message ID 20240529220026.1644986-2-wsadowski@marvell.com
State Superseded
Headers show
Series Marvell HW overlay support for Cadence xSPI | expand

Commit Message

Witold Sadowski May 29, 2024, 10 p.m. UTC
Add new bindings for the v2 Marvell xSPI overlay: marvell,cn10-xspi-nor
compatible string. This new compatible string distinguishes between the
original and modified xSPI block.

Also add an optional base for the xfer register set with an additional
reg field to allocate the xSPI Marvell overlay XFER block.

Signed-off-by: Witold Sadowski <wsadowski@marvell.com>
---
 .../devicetree/bindings/spi/cdns,xspi.yaml    | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

Comments

Rob Herring (Arm) May 31, 2024, 1:47 a.m. UTC | #1
On Wed, May 29, 2024 at 03:00:23PM -0700, Witold Sadowski wrote:
> Add new bindings for the v2 Marvell xSPI overlay: marvell,cn10-xspi-nor
> compatible string. This new compatible string distinguishes between the
> original and modified xSPI block.
> 
> Also add an optional base for the xfer register set with an additional
> reg field to allocate the xSPI Marvell overlay XFER block.
> 
> Signed-off-by: Witold Sadowski <wsadowski@marvell.com>

Missing a tag.

But since you want it reviewed again...

> ---
>  .../devicetree/bindings/spi/cdns,xspi.yaml    | 32 ++++++++++++++++---
>  1 file changed, 28 insertions(+), 4 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/spi/cdns,xspi.yaml b/Documentation/devicetree/bindings/spi/cdns,xspi.yaml
> index eb0f92468185..49c6a2c82fc4 100644
> --- a/Documentation/devicetree/bindings/spi/cdns,xspi.yaml
> +++ b/Documentation/devicetree/bindings/spi/cdns,xspi.yaml
> @@ -15,24 +15,27 @@ description: |
>    single, dual, quad or octal wire transmission modes for
>    read/write access to slaves such as SPI-NOR flash.
>  
> -allOf:
> -  - $ref: spi-controller.yaml#
> -
>  properties:
>    compatible:
> -    const: cdns,xspi-nor
> +    enum:
> +      - cdns,xspi-nor
> +      - marvell,cn10-xspi-nor
>  
>    reg:
>      items:
>        - description: address and length of the controller register set
>        - description: address and length of the Slave DMA data port
>        - description: address and length of the auxiliary registers
> +      - description: address and length of the xfer registers
> +    minItems: 3
>  
>    reg-names:
>      items:
>        - const: io
>        - const: sdma
>        - const: aux
> +      - const: xferbase

'base' is redundant.

> +    minItems: 3
>  
>    interrupts:
>      maxItems: 1
> @@ -42,6 +45,27 @@ required:
>    - reg
>    - interrupts
>  
> +allOf:
> +  - $ref: spi-controller.yaml#
> +  - if:
> +      properties:
> +        compatible:
> +          contains:
> +            enum:
> +              - marvell,cn10-xspi-nor
> +    then:
> +      properties:
> +        reg:
> +          minItems: 4
> +        reg-names:
> +          minItems: 4
> +    else:
> +      properties:
> +        reg:
> +          maxItems: 3
> +        reg-names:
> +          maxItems: 3
> +
>  unevaluatedProperties: false
>  
>  examples:
> -- 
> 2.43.0
>
Witold Sadowski June 7, 2024, 3:12 p.m. UTC | #2
> ----------------------------------------------------------------------
> On Wed, May 29, 2024 at 03:00:23PM -0700, Witold Sadowski wrote:
> > Add new bindings for the v2 Marvell xSPI overlay:
> > marvell,cn10-xspi-nor compatible string. This new compatible string
> > distinguishes between the original and modified xSPI block.
> >
> > Also add an optional base for the xfer register set with an additional
> > reg field to allocate the xSPI Marvell overlay XFER block.
> >
> > Signed-off-by: Witold Sadowski <wsadowski@marvell.com>
> 
> Missing a tag.
> 
> But since you want it reviewed again...
> 
> > ---
> >  .../devicetree/bindings/spi/cdns,xspi.yaml    | 32 ++++++++++++++++---
> >  1 file changed, 28 insertions(+), 4 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/spi/cdns,xspi.yaml
> > b/Documentation/devicetree/bindings/spi/cdns,xspi.yaml
> > index eb0f92468185..49c6a2c82fc4 100644
> > --- a/Documentation/devicetree/bindings/spi/cdns,xspi.yaml
> > +++ b/Documentation/devicetree/bindings/spi/cdns,xspi.yaml
> > @@ -15,24 +15,27 @@ description: |
> >    single, dual, quad or octal wire transmission modes for
> >    read/write access to slaves such as SPI-NOR flash.
> >
> > -allOf:
> > -  - $ref: spi-controller.yaml#
> > -
> >  properties:
> >    compatible:
> > -    const: cdns,xspi-nor
> > +    enum:
> > +      - cdns,xspi-nor
> > +      - marvell,cn10-xspi-nor
> >
> >    reg:
> >      items:
> >        - description: address and length of the controller register set
> >        - description: address and length of the Slave DMA data port
> >        - description: address and length of the auxiliary registers
> > +      - description: address and length of the xfer registers
> > +    minItems: 3
> >
> >    reg-names:
> >      items:
> >        - const: io
> >        - const: sdma
> >        - const: aux
> > +      - const: xferbase
> 
> 'base' is redundant.

Ok

> 
> > +    minItems: 3
> >
> >    interrupts:
> >      maxItems: 1
> > @@ -42,6 +45,27 @@ required:
> >    - reg
> >    - interrupts
> >
> > +allOf:
> > +  - $ref: spi-controller.yaml#
> > +  - if:
> > +      properties:
> > +        compatible:
> > +          contains:
> > +            enum:
> > +              - marvell,cn10-xspi-nor
> > +    then:
> > +      properties:
> > +        reg:
> > +          minItems: 4
> > +        reg-names:
> > +          minItems: 4
> > +    else:
> > +      properties:
> > +        reg:
> > +          maxItems: 3
> > +        reg-names:
> > +          maxItems: 3
> > +
> >  unevaluatedProperties: false
> >
> >  examples:
> > --
> > 2.43.0
> >
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/spi/cdns,xspi.yaml b/Documentation/devicetree/bindings/spi/cdns,xspi.yaml
index eb0f92468185..49c6a2c82fc4 100644
--- a/Documentation/devicetree/bindings/spi/cdns,xspi.yaml
+++ b/Documentation/devicetree/bindings/spi/cdns,xspi.yaml
@@ -15,24 +15,27 @@  description: |
   single, dual, quad or octal wire transmission modes for
   read/write access to slaves such as SPI-NOR flash.
 
-allOf:
-  - $ref: spi-controller.yaml#
-
 properties:
   compatible:
-    const: cdns,xspi-nor
+    enum:
+      - cdns,xspi-nor
+      - marvell,cn10-xspi-nor
 
   reg:
     items:
       - description: address and length of the controller register set
       - description: address and length of the Slave DMA data port
       - description: address and length of the auxiliary registers
+      - description: address and length of the xfer registers
+    minItems: 3
 
   reg-names:
     items:
       - const: io
       - const: sdma
       - const: aux
+      - const: xferbase
+    minItems: 3
 
   interrupts:
     maxItems: 1
@@ -42,6 +45,27 @@  required:
   - reg
   - interrupts
 
+allOf:
+  - $ref: spi-controller.yaml#
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - marvell,cn10-xspi-nor
+    then:
+      properties:
+        reg:
+          minItems: 4
+        reg-names:
+          minItems: 4
+    else:
+      properties:
+        reg:
+          maxItems: 3
+        reg-names:
+          maxItems: 3
+
 unevaluatedProperties: false
 
 examples: