Re: [PATCH 1/2] Revert "dt-bindings: net: mscc,vsc7514-switch: Simplify DSA and switch references"

[Rob Herring <robh@kernel.org>]

On Mon, Mar 24, 2025 at 09:55:05AM +0100, Rasmus Villemoes wrote:
> The commit log for commit 7c93392d754e ("dt-bindings: net:
> mscc,vsc7514-switch: Simplify DSA and switch references") says
> 
>   The mscc,vsc7514-switch schema doesn't add any custom port
>   properties
> 
> In preparation for adding such a custom port property, revert that
> commit.

This leaves the schema in wrong state until the next patch and doesn't 
really stand on its own. So I would combine the 2 patches.

> 
> Signed-off-by: Rasmus Villemoes <ravi@prevas.dk>
> ---
>  .../bindings/net/mscc,vsc7514-switch.yaml          | 14 ++++++++++++--
>  1 file changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml b/Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml
> index 86a9c3fc76c89..07de52a3a2951 100644
> --- a/Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml
> +++ b/Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml
> @@ -24,7 +24,7 @@ allOf:
>          compatible:
>            const: mscc,vsc7514-switch
>      then:
> -      $ref: ethernet-switch.yaml#/$defs/ethernet-ports
> +      $ref: ethernet-switch.yaml#
>        required:
>          - interrupts
>          - interrupt-names
> @@ -33,18 +33,28 @@ allOf:
>            minItems: 21
>          reg-names:
>            minItems: 21
> +        ethernet-ports:
> +          patternProperties:
> +            "^port@[0-9a-f]+$":
> +              $ref: ethernet-switch-port.yaml#
> +              unevaluatedProperties: false
>  
>    - if:
>        properties:
>          compatible:
>            const: mscc,vsc7512-switch
>      then:
> -      $ref: /schemas/net/dsa/dsa.yaml#/$defs/ethernet-ports
> +      $ref: /schemas/net/dsa/dsa.yaml#
>        properties:
>          reg:
>            maxItems: 20
>          reg-names:
>            maxItems: 20
> +        ethernet-ports:
> +          patternProperties:
> +            "^port@[0-9a-f]+$":
> +              $ref: /schemas/net/dsa/dsa-port.yaml#
> +              unevaluatedProperties: false
>  
>  properties:
>    compatible:
> -- 
> 2.49.0
>