Commit 4b316e07 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'dt-bindings-net-child-node-schema-cleanups' 

Rob Herring says:

====================
dt-bindings: net: Child node schema cleanups

This is a series of clean-ups related to ensuring that child node
schemas are constrained to not allow undefined properties. Typically,
that means just adding additionalProperties or unevaluatedProperties as
appropriate. The DSA/switch schemas turned out to be a bit more
involved, so there's some more fixes and a bit of restructuring in them.
====================

Link: https://lore.kernel.org/r/20231016-dt-net-cleanups-v1-0-a525a090b444@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents dcf02bac 31f47f30

Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml

+2 −0
Original line number Diff line number Diff line
@@ -158,6 +158,8 @@ allOf: 
              patternProperties:

                "^ethernet-phy@[0-9a-f]$":

                  type: object

                  $ref: ethernet-phy.yaml#

                  unevaluatedProperties: false

                  description:

                    Integrated PHY node

Documentation/devicetree/bindings/net/brcm,asp-v2.0.yaml

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ properties: 
        const: 0



    patternProperties:

      "^port@[0-9]+$":

      "^port@[0-9a-f]+$":

        type: object



        $ref: ethernet-controller.yaml#

Documentation/devicetree/bindings/net/dsa/brcm,sf2.yaml

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ properties: 


  ports:

    type: object

    additionalProperties: true



    patternProperties:

      '^port@[0-9a-f]$':

Documentation/devicetree/bindings/net/dsa/dsa.yaml

+1 −10
Original line number Diff line number Diff line
@@ -40,17 +40,8 @@ $defs: 


    patternProperties:

      "^(ethernet-)?ports$":

        type: object

        additionalProperties: false



        properties:

          '#address-cells':

            const: 1

          '#size-cells':

            const: 0



        patternProperties:

          "^(ethernet-)?port@[0-9]+$":

          "^(ethernet-)?port@[0-9a-f]+$":

            description: Ethernet switch ports

            $ref: dsa-port.yaml#

            unevaluatedProperties: false

Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml

+5 −3
Original line number Diff line number Diff line
@@ -154,10 +154,12 @@ properties: 
patternProperties:

  "^(ethernet-)?ports$":

    type: object

    additionalProperties: true



    patternProperties:

      "^(ethernet-)?port@[0-9]+$":

      "^(ethernet-)?port@[0-6]$":

        type: object

        additionalProperties: true



        properties:

          reg:
@@ -184,7 +186,7 @@ $defs: 
    patternProperties:

      "^(ethernet-)?ports$":

        patternProperties:

          "^(ethernet-)?port@[0-9]+$":

          "^(ethernet-)?port@[0-6]$":

            if:

              required: [ ethernet ]

            then:
@@ -210,7 +212,7 @@ $defs: 
    patternProperties:

      "^(ethernet-)?ports$":

        patternProperties:

          "^(ethernet-)?port@[0-9]+$":

          "^(ethernet-)?port@[0-6]$":

            if:

              required: [ ethernet ]

            then: