Message ID | 20231016-dt-net-cleanups-v1-4-a525a090b444@kernel.org (mailing list archive) |
---|---|
State | Accepted |
Commit | f0fdec925fe7adf725de238b9eea59702d0d58e0 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | dt-bindings: net: Child node schema cleanups | expand |
On 17.10.2023 00:44, Rob Herring wrote: > The '$defs/ethernet-ports' schema is referenced by schemas defining a > child node 'ethernet-ports', but this schema misses the > 'ethernet-ports' node. It would work if referring schemas made a > reference like this: > > properties: > ethernet-ports: > $ref: ethernet-switch.yaml#/$defs/ethernet-ports > > However, that would be different from how dsa.yaml works. For > consistency, align the schema definition with dsa.yaml and add the > missing level. > > Signed-off-by: Rob Herring <robh@kernel.org> Acked-by: Arınç ÜNAL <arinc.unal@arinc9.com> Arınç
On Mon, Oct 16, 2023 at 04:44:23PM -0500, Rob Herring wrote: > The '$defs/ethernet-ports' schema is referenced by schemas defining a > child node 'ethernet-ports', but this schema misses the > 'ethernet-ports' node. It would work if referring schemas made a > reference like this: > > properties: > ethernet-ports: > $ref: ethernet-switch.yaml#/$defs/ethernet-ports > > However, that would be different from how dsa.yaml works. For > consistency, align the schema definition with dsa.yaml and add the > missing level. > > Signed-off-by: Rob Herring <robh@kernel.org> > --- > Documentation/devicetree/bindings/net/ethernet-switch.yaml | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/ethernet-switch.yaml b/Documentation/devicetree/bindings/net/ethernet-switch.yaml > index dcbffe19d71a..688938c2e261 100644 > --- a/Documentation/devicetree/bindings/net/ethernet-switch.yaml > +++ b/Documentation/devicetree/bindings/net/ethernet-switch.yaml > @@ -58,9 +58,11 @@ $defs: > $ref: '#' > > patternProperties: > - "^(ethernet-)?port@[0-9a-f]+$": > - description: Ethernet switch ports > - $ref: ethernet-switch-port.yaml# > - unevaluatedProperties: false > + "^(ethernet-)?ports$": > + patternProperties: > + "^(ethernet-)?port@[0-9a-f]+$": > + description: Ethernet switch ports > + $ref: ethernet-switch-port.yaml# > + unevaluatedProperties: false > > ... > > -- > 2.42.0 > Huh, interesting. Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
diff --git a/Documentation/devicetree/bindings/net/ethernet-switch.yaml b/Documentation/devicetree/bindings/net/ethernet-switch.yaml index dcbffe19d71a..688938c2e261 100644 --- a/Documentation/devicetree/bindings/net/ethernet-switch.yaml +++ b/Documentation/devicetree/bindings/net/ethernet-switch.yaml @@ -58,9 +58,11 @@ $defs: $ref: '#' patternProperties: - "^(ethernet-)?port@[0-9a-f]+$": - description: Ethernet switch ports - $ref: ethernet-switch-port.yaml# - unevaluatedProperties: false + "^(ethernet-)?ports$": + patternProperties: + "^(ethernet-)?port@[0-9a-f]+$": + description: Ethernet switch ports + $ref: ethernet-switch-port.yaml# + unevaluatedProperties: false ...
The '$defs/ethernet-ports' schema is referenced by schemas defining a child node 'ethernet-ports', but this schema misses the 'ethernet-ports' node. It would work if referring schemas made a reference like this: properties: ethernet-ports: $ref: ethernet-switch.yaml#/$defs/ethernet-ports However, that would be different from how dsa.yaml works. For consistency, align the schema definition with dsa.yaml and add the missing level. Signed-off-by: Rob Herring <robh@kernel.org> --- Documentation/devicetree/bindings/net/ethernet-switch.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)