Re: [PATCH v1 net-next 3/7] dt-bindings: net: dsa: qca8k: utilize shared dsa.yaml
From: Rob Herring
Date: Tue Oct 25 2022 - 17:21:24 EST
On Mon, Oct 24, 2022 at 10:03:51PM -0700, Colin Foster wrote:
> The dsa.yaml binding contains duplicated bindings for address and size
> cells, as well as the reference to dsa-port.yaml. Instead of duplicating
> this information, remove the reference to dsa-port.yaml and include the
> full reference to dsa.yaml.
I don't think this works without further restructuring. Essentially,
'unevaluatedProperties' on works on a single level. So every level has
to define all properties at that level either directly in
properties/patternProperties or within a $ref.
See how graph.yaml is structured and referenced for an example how this
has to work.
>
> Signed-off-by: Colin Foster <colin.foster@xxxxxxxxxxxxxxxx>
> Suggested-by: Vladimir Oltean <olteanv@xxxxxxxxx>
> ---
> .../devicetree/bindings/net/dsa/qca8k.yaml | 14 +++-----------
> 1 file changed, 3 insertions(+), 11 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/net/dsa/qca8k.yaml b/Documentation/devicetree/bindings/net/dsa/qca8k.yaml
> index 978162df51f7..7884f68cab73 100644
> --- a/Documentation/devicetree/bindings/net/dsa/qca8k.yaml
> +++ b/Documentation/devicetree/bindings/net/dsa/qca8k.yaml
> @@ -66,22 +66,16 @@ properties:
> With the legacy mapping the reg corresponding to the internal
> mdio is the switch reg with an offset of -1.
>
> +$ref: "dsa.yaml#"
> +
> patternProperties:
> "^(ethernet-)?ports$":
> type: object
> - properties:
> - '#address-cells':
> - const: 1
> - '#size-cells':
> - const: 0
> -
> patternProperties:
> "^(ethernet-)?port@[0-6]$":
> type: object
> description: Ethernet switch ports
>
> - $ref: dsa-port.yaml#
> -
> properties:
> qca,sgmii-rxclk-falling-edge:
> $ref: /schemas/types.yaml#/definitions/flag
> @@ -104,8 +98,6 @@ patternProperties:
> SGMII on the QCA8337, it is advised to set this unless a communication
> issue is observed.
>
> - unevaluatedProperties: false
> -
Dropping this means any undefined properties in port nodes won't be an
error. Once I fix all the issues related to these missing, there will be
a meta-schema checking for this (this could be one I fixed already).
> oneOf:
> - required:
> - ports
> @@ -116,7 +108,7 @@ required:
> - compatible
> - reg
>
> -additionalProperties: true
This should certainly be changed though. We should only have 'true' for
incomplete collections of properties. IOW, for common bindings.
> +unevaluatedProperties: false
>
> examples:
> - |
> --
> 2.25.1
>
>