From: Colin Foster <colin.foster@in-advantage.com> To: linux-renesas-soc@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, netdev@vger.kernel.org Cc: "John Crispin" <john@phrozen.org>, "Alexandre Belloni" <alexandre.belloni@bootlin.com>, "Claudiu Manoil" <claudiu.manoil@nxp.com>, "Marek Vasut" <marex@denx.de>, "Sean Wang" <sean.wang@mediatek.com>, "DENG Qingfang" <dqfext@gmail.com>, "Landen Chao" <Landen.Chao@mediatek.com>, "nç ÜNAL" <arinc.unal@arinc9.com>, "Vivien Didelot" <vivien.didelot@gmail.com>, "Clément Léger" <clement.leger@bootlin.com>, "Alvin Šipraga" <alsi@bang-olufsen.dk>, "Linus Walleij" <linus.walleij@linaro.org>, UNGLinuxDriver@microchip.com, "Woojung Huh" <woojung.huh@microchip.com>, "Matthias Brugger" <matthias.bgg@gmail.com>, "Kurt Kanzenbach" <kurt@linutronix.de>, "Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>, "Rob Herring" <robh+dt@kernel.org>, "Paolo Abeni" <pabeni@redhat.com>, "Jakub Kicinski" <kuba@kernel.org>, "Eric Dumazet" <edumazet@google.com>, "David S. Miller" <davem@davemloft.net>, "Vladimir Oltean" <olteanv@gmail.com>, "Florian Fainelli" <f.fainelli@gmail.com>, "Andrew Lunn" <andrew@lunn.ch>, "George McCollister" <george.mccollister@gmail.com> Subject: [PATCH v3 net-next 08/10] dt-bindings: net: add generic ethernet-switch Date: Sun, 27 Nov 2022 14:47:32 -0800 [thread overview] Message-ID: <20221127224734.885526-9-colin.foster@in-advantage.com> (raw) In-Reply-To: <20221127224734.885526-1-colin.foster@in-advantage.com> The dsa.yaml bindings had references that can apply to non-dsa switches. To prevent duplication of this information, keep the dsa-specific information inside dsa.yaml and move the remaining generic information to the newly created ethernet-switch.yaml. Signed-off-by: Colin Foster <colin.foster@in-advantage.com> Suggested-by: Vladimir Oltean <olteanv@gmail.com> --- v2 -> v3 * Change ethernet-switch.yaml title from "Ethernet Switch Device Tree Bindings" to "Generic Ethernet Switch" * Rework ethernet-switch.yaml description * Add base defs structure for switches that don't have any additional properties. * Add "additionalProperties: true" under "^(ethernet-)?ports$" node * Correct port reference from /schemas/net/dsa/dsa-port.yaml# to ethernet-controller.yaml# v1 -> v2 * No net change, but deletions from dsa.yaml included the changes for "addionalProperties: true" under ports and "unevaluatedProperties: true" under port. --- .../devicetree/bindings/net/dsa/dsa.yaml | 28 +------- .../bindings/net/ethernet-switch.yaml | 64 +++++++++++++++++++ MAINTAINERS | 1 + 3 files changed, 67 insertions(+), 26 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/ethernet-switch.yaml diff --git a/Documentation/devicetree/bindings/net/dsa/dsa.yaml b/Documentation/devicetree/bindings/net/dsa/dsa.yaml index 87475c2ab092..616753ba85a2 100644 --- a/Documentation/devicetree/bindings/net/dsa/dsa.yaml +++ b/Documentation/devicetree/bindings/net/dsa/dsa.yaml @@ -18,6 +18,8 @@ description: select: false +$ref: "/schemas/net/ethernet-switch.yaml#" + properties: dsa,member: minItems: 2 @@ -29,32 +31,6 @@ properties: (single device hanging off a CPU port) must not specify this property $ref: /schemas/types.yaml#/definitions/uint32-array -patternProperties: - "^(ethernet-)?ports$": - type: object - properties: - '#address-cells': - const: 1 - '#size-cells': - const: 0 - - additionalProperties: true - - patternProperties: - "^(ethernet-)?port@[0-9]+$": - type: object - description: Ethernet switch ports - - $ref: dsa-port.yaml# - - unevaluatedProperties: true - -oneOf: - - required: - - ports - - required: - - ethernet-ports - additionalProperties: true $defs: diff --git a/Documentation/devicetree/bindings/net/ethernet-switch.yaml b/Documentation/devicetree/bindings/net/ethernet-switch.yaml new file mode 100644 index 000000000000..d5bf9a2d8083 --- /dev/null +++ b/Documentation/devicetree/bindings/net/ethernet-switch.yaml @@ -0,0 +1,64 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/ethernet-switch.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Generic Ethernet Switch + +maintainers: + - Andrew Lunn <andrew@lunn.ch> + - Florian Fainelli <f.fainelli@gmail.com> + - Vivien Didelot <vivien.didelot@gmail.com> + +description: + Ethernet switches are multi-port Ethernet controllers. Each port has + its own number and is represented as its own Ethernet controller. + The minimum required functionality is to pass packets to software. + They may or may not be able to forward packets automonously between + ports. + +select: false + +properties: + $nodename: + pattern: "^(ethernet-)?switch(@.*)?$" + +patternProperties: + "^(ethernet-)?ports$": + type: object + additionalProperties: false + + properties: + '#address-cells': + const: 1 + '#size-cells': + const: 0 + + patternProperties: + "^(ethernet-)?port@[0-9]+$": + type: object + description: Ethernet switch ports + + $ref: ethernet-controller.yaml# + +oneOf: + - required: + - ports + - required: + - ethernet-ports + +additionalProperties: true + +$defs: + base: + description: An ethernet switch without any extra port properties + $ref: '#/' + + patternProperties: + "^(ethernet-)?port@[0-9]+$": + description: Ethernet switch ports + $ref: ethernet-controller.yaml# + unevaluatedProperties: false + +... diff --git a/MAINTAINERS b/MAINTAINERS index 9b12d715fc66..3077c5af6072 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14332,6 +14332,7 @@ M: Florian Fainelli <f.fainelli@gmail.com> M: Vladimir Oltean <olteanv@gmail.com> S: Maintained F: Documentation/devicetree/bindings/net/dsa/ +F: Documentation/devicetree/bindings/net/ethernet-switch.yaml F: drivers/net/dsa/ F: include/linux/dsa/ F: include/linux/platform_data/dsa.h -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Colin Foster <colin.foster@in-advantage.com> To: linux-renesas-soc@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, netdev@vger.kernel.org Cc: "John Crispin" <john@phrozen.org>, "Alexandre Belloni" <alexandre.belloni@bootlin.com>, "Claudiu Manoil" <claudiu.manoil@nxp.com>, "Marek Vasut" <marex@denx.de>, "Sean Wang" <sean.wang@mediatek.com>, "DENG Qingfang" <dqfext@gmail.com>, "Landen Chao" <Landen.Chao@mediatek.com>, "nç ÜNAL" <arinc.unal@arinc9.com>, "Vivien Didelot" <vivien.didelot@gmail.com>, "Clément Léger" <clement.leger@bootlin.com>, "Alvin Šipraga" <alsi@bang-olufsen.dk>, "Linus Walleij" <linus.walleij@linaro.org>, UNGLinuxDriver@microchip.com, "Woojung Huh" <woojung.huh@microchip.com>, "Matthias Brugger" <matthias.bgg@gmail.com>, "Kurt Kanzenbach" <kurt@linutronix.de>, "Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>, "Rob Herring" <robh+dt@kernel.org>, "Paolo Abeni" <pabeni@redhat.com>, "Jakub Kicinski" <kuba@kernel.org>, "Eric Dumazet" <edumazet@google.com>, "David S. Miller" <davem@davemloft.net>, "Vladimir Oltean" <olteanv@gmail.com>, "Florian Fainelli" <f.fainelli@gmail.com>, "Andrew Lunn" <andrew@lunn.ch>, "George McCollister" <george.mccollister@gmail.com> Subject: [PATCH v3 net-next 08/10] dt-bindings: net: add generic ethernet-switch Date: Sun, 27 Nov 2022 14:47:32 -0800 [thread overview] Message-ID: <20221127224734.885526-9-colin.foster@in-advantage.com> (raw) In-Reply-To: <20221127224734.885526-1-colin.foster@in-advantage.com> The dsa.yaml bindings had references that can apply to non-dsa switches. To prevent duplication of this information, keep the dsa-specific information inside dsa.yaml and move the remaining generic information to the newly created ethernet-switch.yaml. Signed-off-by: Colin Foster <colin.foster@in-advantage.com> Suggested-by: Vladimir Oltean <olteanv@gmail.com> --- v2 -> v3 * Change ethernet-switch.yaml title from "Ethernet Switch Device Tree Bindings" to "Generic Ethernet Switch" * Rework ethernet-switch.yaml description * Add base defs structure for switches that don't have any additional properties. * Add "additionalProperties: true" under "^(ethernet-)?ports$" node * Correct port reference from /schemas/net/dsa/dsa-port.yaml# to ethernet-controller.yaml# v1 -> v2 * No net change, but deletions from dsa.yaml included the changes for "addionalProperties: true" under ports and "unevaluatedProperties: true" under port. --- .../devicetree/bindings/net/dsa/dsa.yaml | 28 +------- .../bindings/net/ethernet-switch.yaml | 64 +++++++++++++++++++ MAINTAINERS | 1 + 3 files changed, 67 insertions(+), 26 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/ethernet-switch.yaml diff --git a/Documentation/devicetree/bindings/net/dsa/dsa.yaml b/Documentation/devicetree/bindings/net/dsa/dsa.yaml index 87475c2ab092..616753ba85a2 100644 --- a/Documentation/devicetree/bindings/net/dsa/dsa.yaml +++ b/Documentation/devicetree/bindings/net/dsa/dsa.yaml @@ -18,6 +18,8 @@ description: select: false +$ref: "/schemas/net/ethernet-switch.yaml#" + properties: dsa,member: minItems: 2 @@ -29,32 +31,6 @@ properties: (single device hanging off a CPU port) must not specify this property $ref: /schemas/types.yaml#/definitions/uint32-array -patternProperties: - "^(ethernet-)?ports$": - type: object - properties: - '#address-cells': - const: 1 - '#size-cells': - const: 0 - - additionalProperties: true - - patternProperties: - "^(ethernet-)?port@[0-9]+$": - type: object - description: Ethernet switch ports - - $ref: dsa-port.yaml# - - unevaluatedProperties: true - -oneOf: - - required: - - ports - - required: - - ethernet-ports - additionalProperties: true $defs: diff --git a/Documentation/devicetree/bindings/net/ethernet-switch.yaml b/Documentation/devicetree/bindings/net/ethernet-switch.yaml new file mode 100644 index 000000000000..d5bf9a2d8083 --- /dev/null +++ b/Documentation/devicetree/bindings/net/ethernet-switch.yaml @@ -0,0 +1,64 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/ethernet-switch.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Generic Ethernet Switch + +maintainers: + - Andrew Lunn <andrew@lunn.ch> + - Florian Fainelli <f.fainelli@gmail.com> + - Vivien Didelot <vivien.didelot@gmail.com> + +description: + Ethernet switches are multi-port Ethernet controllers. Each port has + its own number and is represented as its own Ethernet controller. + The minimum required functionality is to pass packets to software. + They may or may not be able to forward packets automonously between + ports. + +select: false + +properties: + $nodename: + pattern: "^(ethernet-)?switch(@.*)?$" + +patternProperties: + "^(ethernet-)?ports$": + type: object + additionalProperties: false + + properties: + '#address-cells': + const: 1 + '#size-cells': + const: 0 + + patternProperties: + "^(ethernet-)?port@[0-9]+$": + type: object + description: Ethernet switch ports + + $ref: ethernet-controller.yaml# + +oneOf: + - required: + - ports + - required: + - ethernet-ports + +additionalProperties: true + +$defs: + base: + description: An ethernet switch without any extra port properties + $ref: '#/' + + patternProperties: + "^(ethernet-)?port@[0-9]+$": + description: Ethernet switch ports + $ref: ethernet-controller.yaml# + unevaluatedProperties: false + +... diff --git a/MAINTAINERS b/MAINTAINERS index 9b12d715fc66..3077c5af6072 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14332,6 +14332,7 @@ M: Florian Fainelli <f.fainelli@gmail.com> M: Vladimir Oltean <olteanv@gmail.com> S: Maintained F: Documentation/devicetree/bindings/net/dsa/ +F: Documentation/devicetree/bindings/net/ethernet-switch.yaml F: drivers/net/dsa/ F: include/linux/dsa/ F: include/linux/platform_data/dsa.h -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-11-27 22:49 UTC|newest] Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-11-27 22:47 [PATCH v3 net-next 00/10] dt-binding preparation for ocelot switches Colin Foster 2022-11-27 22:47 ` Colin Foster 2022-11-27 22:47 ` [PATCH v3 net-next 01/10] dt-bindings: net: dsa: sf2: fix brcm,use-bcm-hdr documentation Colin Foster 2022-11-27 22:47 ` Colin Foster 2022-11-28 20:23 ` Florian Fainelli 2022-11-28 20:23 ` Florian Fainelli 2022-12-01 22:22 ` Rob Herring 2022-12-01 22:22 ` Rob Herring 2022-11-27 22:47 ` [PATCH v3 net-next 02/10] dt-bindings: net: dsa: qca8k: remove address-cells and size-cells from switch node Colin Foster 2022-11-27 22:47 ` Colin Foster 2022-11-28 20:41 ` Florian Fainelli 2022-11-28 20:41 ` Florian Fainelli 2022-12-01 22:24 ` Rob Herring 2022-12-01 22:24 ` Rob Herring 2022-11-27 22:47 ` [PATCH v3 net-next 03/10] dt-bindings: net: dsa: utilize base definitions for standard dsa switches Colin Foster 2022-11-27 22:47 ` Colin Foster 2022-11-28 9:32 ` Alvin Šipraga 2022-11-28 9:32 ` Alvin Šipraga 2022-11-28 20:21 ` Linus Walleij 2022-11-28 20:21 ` Linus Walleij 2022-11-29 9:20 ` Colin Foster 2022-11-29 9:20 ` Colin Foster 2022-11-28 20:41 ` Florian Fainelli 2022-11-28 20:41 ` Florian Fainelli 2022-11-28 23:23 ` Rob Herring 2022-11-28 23:23 ` Rob Herring 2022-11-29 9:34 ` Colin Foster 2022-11-29 9:34 ` Colin Foster 2022-11-29 3:58 ` Colin Foster 2022-11-29 3:58 ` Colin Foster 2022-11-27 22:47 ` [PATCH v3 net-next 04/10] dt-bindings: net: dsa: allow additional ethernet-port properties Colin Foster 2022-11-27 22:47 ` Colin Foster 2022-11-28 20:42 ` Florian Fainelli 2022-11-28 20:42 ` Florian Fainelli 2022-11-28 23:27 ` Rob Herring 2022-11-28 23:27 ` Rob Herring 2022-11-29 7:21 ` Colin Foster 2022-11-29 7:21 ` Colin Foster 2022-12-01 22:33 ` Rob Herring 2022-12-01 22:33 ` Rob Herring 2022-11-27 22:47 ` [PATCH v3 net-next 05/10] dt-bindings: net: dsa: qca8k: utilize shared dsa.yaml Colin Foster 2022-11-27 22:47 ` Colin Foster 2022-11-28 20:42 ` Florian Fainelli 2022-11-28 20:42 ` Florian Fainelli 2022-12-01 22:42 ` Rob Herring 2022-12-01 22:42 ` Rob Herring 2022-12-02 19:31 ` Colin Foster 2022-12-02 19:31 ` Colin Foster 2022-11-27 22:47 ` [PATCH v3 net-next 06/10] dt-bindings: net: dsa: mediatek,mt7530: fix port description location Colin Foster 2022-11-27 22:47 ` Colin Foster 2022-11-28 8:28 ` Arınç ÜNAL 2022-11-28 8:28 ` Arınç ÜNAL 2022-11-29 6:32 ` Colin Foster 2022-11-29 6:32 ` Colin Foster 2022-11-29 8:00 ` Arınç ÜNAL 2022-11-29 8:00 ` Arınç ÜNAL 2022-11-27 22:47 ` [PATCH v3 net-next 07/10] dt-bindings: net: dsa: mediatek,mt7530: remove unnecessary dsa-port reference Colin Foster 2022-11-27 22:47 ` Colin Foster 2022-11-28 20:43 ` Florian Fainelli 2022-11-28 20:43 ` Florian Fainelli 2022-11-27 22:47 ` Colin Foster [this message] 2022-11-27 22:47 ` [PATCH v3 net-next 08/10] dt-bindings: net: add generic ethernet-switch Colin Foster 2022-11-28 20:44 ` Florian Fainelli 2022-11-28 20:44 ` Florian Fainelli 2022-11-27 22:47 ` [PATCH v3 net-next 09/10] dt-bindings: net: add generic ethernet-switch-port binding Colin Foster 2022-11-27 22:47 ` Colin Foster 2022-11-28 20:47 ` Florian Fainelli 2022-11-28 20:47 ` Florian Fainelli 2022-11-27 22:47 ` [PATCH v3 net-next 10/10] dt-bindings: net: mscc,vsc7514-switch: utilize generic ethernet-switch.yaml Colin Foster 2022-11-27 22:47 ` Colin Foster 2022-11-28 20:47 ` Florian Fainelli 2022-11-28 20:47 ` Florian Fainelli
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=20221127224734.885526-9-colin.foster@in-advantage.com \ --to=colin.foster@in-advantage.com \ --cc=Landen.Chao@mediatek.com \ --cc=UNGLinuxDriver@microchip.com \ --cc=alexandre.belloni@bootlin.com \ --cc=alsi@bang-olufsen.dk \ --cc=andrew@lunn.ch \ --cc=arinc.unal@arinc9.com \ --cc=claudiu.manoil@nxp.com \ --cc=clement.leger@bootlin.com \ --cc=davem@davemloft.net \ --cc=devicetree@vger.kernel.org \ --cc=dqfext@gmail.com \ --cc=edumazet@google.com \ --cc=f.fainelli@gmail.com \ --cc=george.mccollister@gmail.com \ --cc=john@phrozen.org \ --cc=krzysztof.kozlowski+dt@linaro.org \ --cc=kuba@kernel.org \ --cc=kurt@linutronix.de \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=marex@denx.de \ --cc=matthias.bgg@gmail.com \ --cc=netdev@vger.kernel.org \ --cc=olteanv@gmail.com \ --cc=pabeni@redhat.com \ --cc=robh+dt@kernel.org \ --cc=sean.wang@mediatek.com \ --cc=vivien.didelot@gmail.com \ --cc=woojung.huh@microchip.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.