diff mbox series

dt-bindings: memory: renesas,rpc-if: Miscellaneous improvements

Message ID d430f9c06d6691fe8a98f923cdb7ca13772834b1.1626262043.git.geert+renesas@glider.be
State Superseded
Headers show
Series dt-bindings: memory: renesas,rpc-if: Miscellaneous improvements | expand

Commit Message

Geert Uytterhoeven July 14, 2021, 11:30 a.m. UTC
- Add missing "#{address,size}-cells",
  - Fix rejection of legitimate flash subnodes containing multiple
    compatible values,
  - Add missing list of required properties.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 .../memory-controllers/renesas,rpc-if.yaml    | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

Comments

Rob Herring (Arm) July 16, 2021, 6:02 p.m. UTC | #1
On Wed, Jul 14, 2021 at 01:30:13PM +0200, Geert Uytterhoeven wrote:
>   - Add missing "#{address,size}-cells",
>   - Fix rejection of legitimate flash subnodes containing multiple
>     compatible values,
>   - Add missing list of required properties.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
>  .../memory-controllers/renesas,rpc-if.yaml    | 23 ++++++++++++++++---
>  1 file changed, 20 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/memory-controllers/renesas,rpc-if.yaml b/Documentation/devicetree/bindings/memory-controllers/renesas,rpc-if.yaml
> index 990489fdd2ac33fe..c0d899a2305361b1 100644
> --- a/Documentation/devicetree/bindings/memory-controllers/renesas,rpc-if.yaml
> +++ b/Documentation/devicetree/bindings/memory-controllers/renesas,rpc-if.yaml
> @@ -56,17 +56,34 @@ properties:
>    resets:
>      maxItems: 1
>  
> +  '#address-cells':
> +    const: 1
> +
> +  '#size-cells':
> +    const: 0
> +

spi-controller.yaml already defines this.

>  patternProperties:
>    "flash@[0-9a-f]+$":
>      type: object
>      properties:
>        compatible:
> -        enum:
> -          - cfi-flash
> -          - jedec,spi-nor
> +        contains:
> +          enum:
> +            - cfi-flash
> +            - jedec,spi-nor
>  
>  unevaluatedProperties: false
>  
> +required:
> +  - compatible
> +  - reg
> +  - reg-names
> +  - clocks
> +  - power-domains
> +  - resets
> +  - '#address-cells'
> +  - '#size-cells'
> +
>  examples:
>    - |
>      #include <dt-bindings/clock/renesas-cpg-mssr.h>
> -- 
> 2.25.1
> 
>
Geert Uytterhoeven July 16, 2021, 7:09 p.m. UTC | #2
Hi Rob,

On Fri, Jul 16, 2021 at 8:02 PM Rob Herring <robh@kernel.org> wrote:
> On Wed, Jul 14, 2021 at 01:30:13PM +0200, Geert Uytterhoeven wrote:
> >   - Add missing "#{address,size}-cells",
> >   - Fix rejection of legitimate flash subnodes containing multiple
> >     compatible values,
> >   - Add missing list of required properties.
> >
> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > ---
> >  .../memory-controllers/renesas,rpc-if.yaml    | 23 ++++++++++++++++---
> >  1 file changed, 20 insertions(+), 3 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/memory-controllers/renesas,rpc-if.yaml b/Documentation/devicetree/bindings/memory-controllers/renesas,rpc-if.yaml
> > index 990489fdd2ac33fe..c0d899a2305361b1 100644
> > --- a/Documentation/devicetree/bindings/memory-controllers/renesas,rpc-if.yaml
> > +++ b/Documentation/devicetree/bindings/memory-controllers/renesas,rpc-if.yaml
> > @@ -56,17 +56,34 @@ properties:
> >    resets:
> >      maxItems: 1
> >
> > +  '#address-cells':
> > +    const: 1
> > +
> > +  '#size-cells':
> > +    const: 0
> > +
>
> spi-controller.yaml already defines this.

spi-controller.yaml says '#address-cells' must be 0 or 1.  As RPC-IF does
SPI master only, it should be 1.

Don't remember why I added the '#size-cells' too. Perhaps for symmetry?

Gr{oetje,eeting}s,

                        Geert
Rob Herring (Arm) July 20, 2021, 4:42 p.m. UTC | #3
On Fri, Jul 16, 2021 at 1:10 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>
> Hi Rob,
>
> On Fri, Jul 16, 2021 at 8:02 PM Rob Herring <robh@kernel.org> wrote:
> > On Wed, Jul 14, 2021 at 01:30:13PM +0200, Geert Uytterhoeven wrote:
> > >   - Add missing "#{address,size}-cells",
> > >   - Fix rejection of legitimate flash subnodes containing multiple
> > >     compatible values,
> > >   - Add missing list of required properties.
> > >
> > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > > ---
> > >  .../memory-controllers/renesas,rpc-if.yaml    | 23 ++++++++++++++++---
> > >  1 file changed, 20 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/Documentation/devicetree/bindings/memory-controllers/renesas,rpc-if.yaml b/Documentation/devicetree/bindings/memory-controllers/renesas,rpc-if.yaml
> > > index 990489fdd2ac33fe..c0d899a2305361b1 100644
> > > --- a/Documentation/devicetree/bindings/memory-controllers/renesas,rpc-if.yaml
> > > +++ b/Documentation/devicetree/bindings/memory-controllers/renesas,rpc-if.yaml
> > > @@ -56,17 +56,34 @@ properties:
> > >    resets:
> > >      maxItems: 1
> > >
> > > +  '#address-cells':
> > > +    const: 1
> > > +
> > > +  '#size-cells':
> > > +    const: 0
> > > +
> >
> > spi-controller.yaml already defines this.
>
> spi-controller.yaml says '#address-cells' must be 0 or 1.  As RPC-IF does
> SPI master only, it should be 1.

Yes, but then it says:

allOf:
  - if:
      not:
        required:
          - spi-slave
    then:
      properties:
        "#address-cells":
          const: 1
    else:
      properties:
        "#address-cells":
          const: 0

Rob
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/memory-controllers/renesas,rpc-if.yaml b/Documentation/devicetree/bindings/memory-controllers/renesas,rpc-if.yaml
index 990489fdd2ac33fe..c0d899a2305361b1 100644
--- a/Documentation/devicetree/bindings/memory-controllers/renesas,rpc-if.yaml
+++ b/Documentation/devicetree/bindings/memory-controllers/renesas,rpc-if.yaml
@@ -56,17 +56,34 @@  properties:
   resets:
     maxItems: 1
 
+  '#address-cells':
+    const: 1
+
+  '#size-cells':
+    const: 0
+
 patternProperties:
   "flash@[0-9a-f]+$":
     type: object
     properties:
       compatible:
-        enum:
-          - cfi-flash
-          - jedec,spi-nor
+        contains:
+          enum:
+            - cfi-flash
+            - jedec,spi-nor
 
 unevaluatedProperties: false
 
+required:
+  - compatible
+  - reg
+  - reg-names
+  - clocks
+  - power-domains
+  - resets
+  - '#address-cells'
+  - '#size-cells'
+
 examples:
   - |
     #include <dt-bindings/clock/renesas-cpg-mssr.h>