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 v4 net-next 8/9] dt-bindings: net: add generic ethernet-switch-port binding Date: Fri, 2 Dec 2022 12:45:58 -0800 [thread overview] Message-ID: <20221202204559.162619-9-colin.foster@in-advantage.com> (raw) In-Reply-To: <20221202204559.162619-1-colin.foster@in-advantage.com> The dsa-port.yaml binding had several references that can be common to all ethernet ports, not just dsa-specific ones. Break out the generic bindings to ethernet-switch-port.yaml they can be used by non-dsa drivers. Signed-off-by: Colin Foster <colin.foster@in-advantage.com> Suggested-by: Vladimir Oltean <olteanv@gmail.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> --- v3 -> v4 * Add Florian Reviewed tag v2 -> v3 * Change dsa-port title from "DSA Switch port Device Tree Bindings" to "Generic DSA Switch port" * Add reference to ethernet-switch-port.yaml# in dsa-port.yaml * Change title of ethernet-switch-port.yaml from "Ethernet Switch port Device Tree Bindings" to "Generic Ethernet Switch port" * Remove most properties from ethernet-switch-port.yaml. They're all in ethernet-controller, and are all allowed. * ethernet-switch.yaml now only references ethernet-switch-port.yaml# under the port node. v1 -> v2 * Remove accidental addition of "$ref: /schemas/net/ethernet-switch-port.yaml" which should be kept out of dsa-port so that it doesn't get referenced multiple times through both ethernet-switch and dsa-port. --- .../devicetree/bindings/net/dsa/dsa-port.yaml | 24 ++---------------- .../bindings/net/ethernet-switch-port.yaml | 25 +++++++++++++++++++ .../bindings/net/ethernet-switch.yaml | 6 +---- MAINTAINERS | 1 + 4 files changed, 29 insertions(+), 27 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/ethernet-switch-port.yaml diff --git a/Documentation/devicetree/bindings/net/dsa/dsa-port.yaml b/Documentation/devicetree/bindings/net/dsa/dsa-port.yaml index 9abb8eba5fad..5b457f41273a 100644 --- a/Documentation/devicetree/bindings/net/dsa/dsa-port.yaml +++ b/Documentation/devicetree/bindings/net/dsa/dsa-port.yaml @@ -4,7 +4,7 @@ $id: http://devicetree.org/schemas/net/dsa/dsa-port.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Ethernet Switch port Device Tree Bindings +title: Generic DSA Switch port maintainers: - Andrew Lunn <andrew@lunn.ch> @@ -14,8 +14,7 @@ maintainers: description: Ethernet switch port Description -allOf: - - $ref: /schemas/net/ethernet-controller.yaml# +$ref: /schemas/net/ethernet-switch-port.yaml# properties: reg: @@ -58,25 +57,6 @@ properties: - rtl8_4t - seville - phy-handle: true - - phy-mode: true - - fixed-link: true - - mac-address: true - - sfp: true - - managed: true - - rx-internal-delay-ps: true - - tx-internal-delay-ps: true - -required: - - reg - # CPU and DSA ports must have phylink-compatible link descriptions if: oneOf: diff --git a/Documentation/devicetree/bindings/net/ethernet-switch-port.yaml b/Documentation/devicetree/bindings/net/ethernet-switch-port.yaml new file mode 100644 index 000000000000..3d7da6916fb8 --- /dev/null +++ b/Documentation/devicetree/bindings/net/ethernet-switch-port.yaml @@ -0,0 +1,25 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/ethernet-switch-port.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Generic Ethernet Switch port + +maintainers: + - Andrew Lunn <andrew@lunn.ch> + - Florian Fainelli <f.fainelli@gmail.com> + - Vivien Didelot <vivien.didelot@gmail.com> + +description: + Ethernet switch port Description + +$ref: ethernet-controller.yaml# + +properties: + reg: + description: Port number + +additionalProperties: true + +... diff --git a/Documentation/devicetree/bindings/net/ethernet-switch.yaml b/Documentation/devicetree/bindings/net/ethernet-switch.yaml index afeb9ffd84c8..1e8b7649a9b2 100644 --- a/Documentation/devicetree/bindings/net/ethernet-switch.yaml +++ b/Documentation/devicetree/bindings/net/ethernet-switch.yaml @@ -40,10 +40,6 @@ patternProperties: type: object description: Ethernet switch ports - $ref: ethernet-controller.yaml# - - additionalProperties: true - oneOf: - required: - ports @@ -60,7 +56,7 @@ $defs: patternProperties: "^(ethernet-)?port@[0-9]+$": description: Ethernet switch ports - $ref: ethernet-controller.yaml# + $ref: ethernet-switch-port.yaml# unevaluatedProperties: false ... diff --git a/MAINTAINERS b/MAINTAINERS index d574cae901b3..fe5f52c9864a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14337,6 +14337,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-port.yaml F: Documentation/devicetree/bindings/net/ethernet-switch.yaml F: drivers/net/dsa/ F: include/linux/dsa/ -- 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 v4 net-next 8/9] dt-bindings: net: add generic ethernet-switch-port binding Date: Fri, 2 Dec 2022 12:45:58 -0800 [thread overview] Message-ID: <20221202204559.162619-9-colin.foster@in-advantage.com> (raw) In-Reply-To: <20221202204559.162619-1-colin.foster@in-advantage.com> The dsa-port.yaml binding had several references that can be common to all ethernet ports, not just dsa-specific ones. Break out the generic bindings to ethernet-switch-port.yaml they can be used by non-dsa drivers. Signed-off-by: Colin Foster <colin.foster@in-advantage.com> Suggested-by: Vladimir Oltean <olteanv@gmail.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> --- v3 -> v4 * Add Florian Reviewed tag v2 -> v3 * Change dsa-port title from "DSA Switch port Device Tree Bindings" to "Generic DSA Switch port" * Add reference to ethernet-switch-port.yaml# in dsa-port.yaml * Change title of ethernet-switch-port.yaml from "Ethernet Switch port Device Tree Bindings" to "Generic Ethernet Switch port" * Remove most properties from ethernet-switch-port.yaml. They're all in ethernet-controller, and are all allowed. * ethernet-switch.yaml now only references ethernet-switch-port.yaml# under the port node. v1 -> v2 * Remove accidental addition of "$ref: /schemas/net/ethernet-switch-port.yaml" which should be kept out of dsa-port so that it doesn't get referenced multiple times through both ethernet-switch and dsa-port. --- .../devicetree/bindings/net/dsa/dsa-port.yaml | 24 ++---------------- .../bindings/net/ethernet-switch-port.yaml | 25 +++++++++++++++++++ .../bindings/net/ethernet-switch.yaml | 6 +---- MAINTAINERS | 1 + 4 files changed, 29 insertions(+), 27 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/ethernet-switch-port.yaml diff --git a/Documentation/devicetree/bindings/net/dsa/dsa-port.yaml b/Documentation/devicetree/bindings/net/dsa/dsa-port.yaml index 9abb8eba5fad..5b457f41273a 100644 --- a/Documentation/devicetree/bindings/net/dsa/dsa-port.yaml +++ b/Documentation/devicetree/bindings/net/dsa/dsa-port.yaml @@ -4,7 +4,7 @@ $id: http://devicetree.org/schemas/net/dsa/dsa-port.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Ethernet Switch port Device Tree Bindings +title: Generic DSA Switch port maintainers: - Andrew Lunn <andrew@lunn.ch> @@ -14,8 +14,7 @@ maintainers: description: Ethernet switch port Description -allOf: - - $ref: /schemas/net/ethernet-controller.yaml# +$ref: /schemas/net/ethernet-switch-port.yaml# properties: reg: @@ -58,25 +57,6 @@ properties: - rtl8_4t - seville - phy-handle: true - - phy-mode: true - - fixed-link: true - - mac-address: true - - sfp: true - - managed: true - - rx-internal-delay-ps: true - - tx-internal-delay-ps: true - -required: - - reg - # CPU and DSA ports must have phylink-compatible link descriptions if: oneOf: diff --git a/Documentation/devicetree/bindings/net/ethernet-switch-port.yaml b/Documentation/devicetree/bindings/net/ethernet-switch-port.yaml new file mode 100644 index 000000000000..3d7da6916fb8 --- /dev/null +++ b/Documentation/devicetree/bindings/net/ethernet-switch-port.yaml @@ -0,0 +1,25 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/ethernet-switch-port.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Generic Ethernet Switch port + +maintainers: + - Andrew Lunn <andrew@lunn.ch> + - Florian Fainelli <f.fainelli@gmail.com> + - Vivien Didelot <vivien.didelot@gmail.com> + +description: + Ethernet switch port Description + +$ref: ethernet-controller.yaml# + +properties: + reg: + description: Port number + +additionalProperties: true + +... diff --git a/Documentation/devicetree/bindings/net/ethernet-switch.yaml b/Documentation/devicetree/bindings/net/ethernet-switch.yaml index afeb9ffd84c8..1e8b7649a9b2 100644 --- a/Documentation/devicetree/bindings/net/ethernet-switch.yaml +++ b/Documentation/devicetree/bindings/net/ethernet-switch.yaml @@ -40,10 +40,6 @@ patternProperties: type: object description: Ethernet switch ports - $ref: ethernet-controller.yaml# - - additionalProperties: true - oneOf: - required: - ports @@ -60,7 +56,7 @@ $defs: patternProperties: "^(ethernet-)?port@[0-9]+$": description: Ethernet switch ports - $ref: ethernet-controller.yaml# + $ref: ethernet-switch-port.yaml# unevaluatedProperties: false ... diff --git a/MAINTAINERS b/MAINTAINERS index d574cae901b3..fe5f52c9864a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14337,6 +14337,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-port.yaml F: Documentation/devicetree/bindings/net/ethernet-switch.yaml F: drivers/net/dsa/ F: include/linux/dsa/ -- 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-12-02 20:47 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-12-02 20:45 [PATCH v4 net-next 0/9] dt-binding preparation for ocelot switches Colin Foster 2022-12-02 20:45 ` Colin Foster 2022-12-02 20:45 ` [PATCH v4 net-next 1/9] dt-bindings: net: dsa: sf2: fix brcm,use-bcm-hdr documentation Colin Foster 2022-12-02 20:45 ` Colin Foster 2022-12-02 20:45 ` [PATCH v4 net-next 2/9] dt-bindings: net: dsa: qca8k: remove address-cells and size-cells from switch node Colin Foster 2022-12-02 20:45 ` Colin Foster 2022-12-02 20:45 ` [PATCH v4 net-next 3/9] dt-bindings: net: dsa: utilize base definitions for standard dsa switches Colin Foster 2022-12-02 20:45 ` Colin Foster 2022-12-02 21:45 ` Arınç ÜNAL 2022-12-02 21:45 ` Arınç ÜNAL 2022-12-06 2:20 ` Colin Foster 2022-12-06 2:20 ` Colin Foster 2022-12-05 18:29 ` Arınç ÜNAL 2022-12-05 18:29 ` Arınç ÜNAL 2022-12-05 21:42 ` Rob Herring 2022-12-05 21:42 ` Rob Herring 2022-12-06 15:18 ` Vladimir Oltean 2022-12-06 15:18 ` Vladimir Oltean 2022-12-07 2:24 ` Colin Foster 2022-12-07 2:24 ` Colin Foster 2022-12-06 15:37 ` Vladimir Oltean 2022-12-06 15:37 ` Vladimir Oltean 2022-12-07 2:27 ` Colin Foster 2022-12-07 2:27 ` Colin Foster 2022-12-09 9:10 ` Krzysztof Kozlowski 2022-12-09 9:10 ` Krzysztof Kozlowski 2022-12-02 20:45 ` [PATCH v4 net-next 4/9] dt-bindings: net: dsa: allow additional ethernet-port properties Colin Foster 2022-12-02 20:45 ` Colin Foster 2022-12-05 21:42 ` Rob Herring 2022-12-05 21:42 ` Rob Herring 2022-12-02 20:45 ` [PATCH v4 net-next 5/9] dt-bindings: net: dsa: qca8k: utilize shared dsa.yaml Colin Foster 2022-12-02 20:45 ` Colin Foster 2022-12-05 21:42 ` Rob Herring 2022-12-05 21:42 ` Rob Herring 2022-12-02 20:45 ` [PATCH v4 net-next 6/9] dt-bindings: net: dsa: mediatek,mt7530: remove unnecessary dsa-port reference Colin Foster 2022-12-02 20:45 ` Colin Foster 2022-12-05 21:44 ` Rob Herring 2022-12-05 21:44 ` Rob Herring 2022-12-02 20:45 ` [PATCH v4 net-next 7/9] dt-bindings: net: add generic ethernet-switch Colin Foster 2022-12-02 20:45 ` Colin Foster 2022-12-05 21:47 ` Rob Herring 2022-12-05 21:47 ` Rob Herring 2022-12-02 20:45 ` Colin Foster [this message] 2022-12-02 20:45 ` [PATCH v4 net-next 8/9] dt-bindings: net: add generic ethernet-switch-port binding Colin Foster 2022-12-05 21:45 ` Rob Herring 2022-12-05 21:45 ` Rob Herring 2022-12-06 15:50 ` Vladimir Oltean 2022-12-06 15:50 ` Vladimir Oltean 2022-12-07 2:49 ` Colin Foster 2022-12-07 2:49 ` Colin Foster 2022-12-02 20:45 ` [PATCH v4 net-next 9/9] dt-bindings: net: mscc,vsc7514-switch: utilize generic ethernet-switch.yaml Colin Foster 2022-12-02 20:45 ` Colin Foster 2022-12-06 16:04 ` [PATCH v4 net-next 0/9] dt-binding preparation for ocelot switches Vladimir Oltean 2022-12-06 16:04 ` Vladimir Oltean 2022-12-07 3:07 ` Colin Foster 2022-12-07 3:07 ` Colin Foster
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=20221202204559.162619-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.