2023-01-03 05:23:12

by Colin Foster

[permalink] [raw]
Subject: [PATCH v6 net-next 10/10] dt-bindings: net: mscc,vsc7514-switch: utilize generic ethernet-switch.yaml

Several bindings for ethernet switches are available for non-dsa switches
by way of ethernet-switch.yaml. Remove these duplicate entries and utilize
the common bindings for the VSC7514.

Signed-off-by: Colin Foster <[email protected]>
Suggested-by: Vladimir Oltean <[email protected]>
Reviewed-by: Florian Fainelli <[email protected]>
Reviewed-by: Rob Herring <[email protected]>
---

v5 -> v6
* No change

v4 -> v5
* Add Rob Reviewed tag

v3 -> v4
* Add Florian Reviewed tag

v2 -> v3:
* Reference ethernet-switch-port.yaml# instead of ethernet-controller
* Undo the addition of "unevaluatedProperties: true" from v2. Those
were only added because of my misunderstandings.
* Keep #address-cells and #size-cells in the ports node.

v1 -> v2:
* Fix "$ref: ethernet-switch.yaml" placement. Oops.
* Add "unevaluatedProperties: true" to ethernet-ports layer so it
can correctly read into ethernet-switch.yaml
* Add "unevaluatedProperties: true" to ethernet-port layer so it can
correctly read into ethernet-controller.yaml

---
.../bindings/net/mscc,vsc7514-switch.yaml | 31 ++-----------------
1 file changed, 3 insertions(+), 28 deletions(-)

diff --git a/Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml b/Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml
index ee0a504bdb24..5ffe831e59e4 100644
--- a/Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml
+++ b/Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml
@@ -18,10 +18,9 @@ description: |
packets using CPU. Additionally, PTP is supported as well as FDMA for faster
packet extraction/injection.

-properties:
- $nodename:
- pattern: "^switch@[0-9a-f]+$"
+$ref: ethernet-switch.yaml#

+properties:
compatible:
const: mscc,vsc7514-switch

@@ -100,35 +99,11 @@ properties:

patternProperties:
"^port@[0-9a-f]+$":
- type: object
- description: Ethernet ports handled by the switch

- $ref: ethernet-controller.yaml#
+ $ref: ethernet-switch-port.yaml#

unevaluatedProperties: false

- properties:
- reg:
- description: Switch port number
-
- phy-handle: true
-
- phy-mode: true
-
- fixed-link: true
-
- mac-address: true
-
- required:
- - reg
- - phy-mode
-
- oneOf:
- - required:
- - phy-handle
- - required:
- - fixed-link
-
required:
- compatible
- reg
--
2.25.1