netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Rasmus Villemoes <ravi@prevas.dk>
To: Colin Foster <colin.foster@in-advantage.com>,
	Rob Herring <robh@kernel.org>
Cc: devicetree@vger.kernel.org,
	Felix Blix Everberg <felix.blix@prevas.dk>,
	netdev@vger.kernel.org, Vladimir Oltean <vladimir.oltean@nxp.com>,
	Rasmus Villemoes <ravi@prevas.dk>
Subject: [PATCH 1/2] Revert "dt-bindings: net: mscc,vsc7514-switch: Simplify DSA and switch references"
Date: Mon, 24 Mar 2025 09:55:05 +0100	[thread overview]
Message-ID: <20250324085506.55916-2-ravi@prevas.dk> (raw)
In-Reply-To: <20250324085506.55916-1-ravi@prevas.dk>

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.

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


  reply	other threads:[~2025-03-24  8:55 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-24  8:55 [PATCH 0/2] dt-bindings: net: mscc,vsc7514-switch: allow specifying 'phys' for switch ports Rasmus Villemoes
2025-03-24  8:55 ` Rasmus Villemoes [this message]
2025-03-24 14:41   ` [PATCH 1/2] Revert "dt-bindings: net: mscc,vsc7514-switch: Simplify DSA and switch references" Rob Herring
2025-03-24  8:55 ` [PATCH 2/2] dt-bindings: net: mscc,vsc7514-switch: allow specifying 'phys' for switch ports Rasmus Villemoes
2025-03-24 10:00   ` Vladimir Oltean
2025-03-24 14:39     ` Rob Herring
2025-03-24 14:21   ` Rob Herring (Arm)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250324085506.55916-2-ravi@prevas.dk \
    --to=ravi@prevas.dk \
    --cc=colin.foster@in-advantage.com \
    --cc=devicetree@vger.kernel.org \
    --cc=felix.blix@prevas.dk \
    --cc=netdev@vger.kernel.org \
    --cc=robh@kernel.org \
    --cc=vladimir.oltean@nxp.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).