From: Linus Walleij <linus.walleij@linaro.org> To: "Andrew Lunn" <andrew@lunn.ch>, "Gregory Clement" <gregory.clement@bootlin.com>, "Sebastian Hesselbarth" <sebastian.hesselbarth@gmail.com>, "Rob Herring" <robh+dt@kernel.org>, "Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>, "Conor Dooley" <conor+dt@kernel.org>, "Russell King" <linux@armlinux.org.uk>, "Florian Fainelli" <f.fainelli@gmail.com>, "Vladimir Oltean" <olteanv@gmail.com>, "David S. Miller" <davem@davemloft.net>, "Eric Dumazet" <edumazet@google.com>, "Jakub Kicinski" <kuba@kernel.org>, "Paolo Abeni" <pabeni@redhat.com>, "Marek Behún" <kabel@kernel.org> Cc: Christian Marangi <ansuelsmth@gmail.com>, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Linus Walleij <linus.walleij@linaro.org>, Rob Herring <robh@kernel.org> Subject: [PATCH net-next v9 3/5] dt-bindings: net: ethernet-switch: Accept special variants Date: Mon, 27 Nov 2023 16:43:06 +0100 [thread overview] Message-ID: <20231127-marvell-88e6152-wan-led-v9-3-272934e04681@linaro.org> (raw) In-Reply-To: <20231127-marvell-88e6152-wan-led-v9-0-272934e04681@linaro.org> Accept special node naming variants for Marvell switches with special node names as ABI. This is maybe not the prettiest but it avoids special-casing the Marvell MV88E6xxx bindings by copying a lot of generic binding code down into that one binding just to special-case these unfixable nodes. Reviewed-by: Rob Herring <robh@kernel.org> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- .../devicetree/bindings/net/ethernet-switch.yaml | 23 +++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/net/ethernet-switch.yaml b/Documentation/devicetree/bindings/net/ethernet-switch.yaml index 72ac67ca3415..b3b7e1a1b127 100644 --- a/Documentation/devicetree/bindings/net/ethernet-switch.yaml +++ b/Documentation/devicetree/bindings/net/ethernet-switch.yaml @@ -20,9 +20,26 @@ description: select: false -properties: - $nodename: - pattern: "^(ethernet-)?switch(@.*)?$" +allOf: + # This condition is here to satisfy the case where certain device + # nodes have to preserve non-standard names because of + # backward-compatibility with boot loaders inspecting certain + # node names. + - if: + properties: + compatible: + contains: + enum: + - marvell,turris-mox-mv88e6085 + - marvell,turris-mox-mv88e6190 + then: + properties: + $nodename: + pattern: "switch[0-3]@[0-3]+$" + else: + properties: + $nodename: + pattern: "^(ethernet-)?switch(@.*)?$" patternProperties: "^(ethernet-)?ports$": -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Linus Walleij <linus.walleij@linaro.org> To: "Andrew Lunn" <andrew@lunn.ch>, "Gregory Clement" <gregory.clement@bootlin.com>, "Sebastian Hesselbarth" <sebastian.hesselbarth@gmail.com>, "Rob Herring" <robh+dt@kernel.org>, "Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>, "Conor Dooley" <conor+dt@kernel.org>, "Russell King" <linux@armlinux.org.uk>, "Florian Fainelli" <f.fainelli@gmail.com>, "Vladimir Oltean" <olteanv@gmail.com>, "David S. Miller" <davem@davemloft.net>, "Eric Dumazet" <edumazet@google.com>, "Jakub Kicinski" <kuba@kernel.org>, "Paolo Abeni" <pabeni@redhat.com>, "Marek Behún" <kabel@kernel.org> Cc: Christian Marangi <ansuelsmth@gmail.com>, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Linus Walleij <linus.walleij@linaro.org>, Rob Herring <robh@kernel.org> Subject: [PATCH net-next v9 3/5] dt-bindings: net: ethernet-switch: Accept special variants Date: Mon, 27 Nov 2023 16:43:06 +0100 [thread overview] Message-ID: <20231127-marvell-88e6152-wan-led-v9-3-272934e04681@linaro.org> (raw) In-Reply-To: <20231127-marvell-88e6152-wan-led-v9-0-272934e04681@linaro.org> Accept special node naming variants for Marvell switches with special node names as ABI. This is maybe not the prettiest but it avoids special-casing the Marvell MV88E6xxx bindings by copying a lot of generic binding code down into that one binding just to special-case these unfixable nodes. Reviewed-by: Rob Herring <robh@kernel.org> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- .../devicetree/bindings/net/ethernet-switch.yaml | 23 +++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/net/ethernet-switch.yaml b/Documentation/devicetree/bindings/net/ethernet-switch.yaml index 72ac67ca3415..b3b7e1a1b127 100644 --- a/Documentation/devicetree/bindings/net/ethernet-switch.yaml +++ b/Documentation/devicetree/bindings/net/ethernet-switch.yaml @@ -20,9 +20,26 @@ description: select: false -properties: - $nodename: - pattern: "^(ethernet-)?switch(@.*)?$" +allOf: + # This condition is here to satisfy the case where certain device + # nodes have to preserve non-standard names because of + # backward-compatibility with boot loaders inspecting certain + # node names. + - if: + properties: + compatible: + contains: + enum: + - marvell,turris-mox-mv88e6085 + - marvell,turris-mox-mv88e6190 + then: + properties: + $nodename: + pattern: "switch[0-3]@[0-3]+$" + else: + properties: + $nodename: + pattern: "^(ethernet-)?switch(@.*)?$" patternProperties: "^(ethernet-)?ports$": -- 2.34.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:[~2023-11-27 15:43 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-11-27 15:43 [PATCH net-next v9 0/5] Create a binding for the Marvell MV88E6xxx DSA switches Linus Walleij 2023-11-27 15:43 ` Linus Walleij 2023-11-27 15:43 ` [PATCH net-next v9 1/5] dt-bindings: net: dsa: Require ports or ethernet-ports Linus Walleij 2023-11-27 15:43 ` Linus Walleij 2023-11-27 15:43 ` [PATCH net-next v9 2/5] dt-bindings: net: mvusb: Fix up DSA example Linus Walleij 2023-11-27 15:43 ` Linus Walleij 2023-11-27 15:43 ` Linus Walleij [this message] 2023-11-27 15:43 ` [PATCH net-next v9 3/5] dt-bindings: net: ethernet-switch: Accept special variants Linus Walleij 2023-11-29 18:06 ` Vladimir Oltean 2023-11-29 18:06 ` Vladimir Oltean 2023-11-27 15:43 ` [PATCH net-next v9 4/5] dt-bindings: marvell: Rewrite MV88E6xxx in schema Linus Walleij 2023-11-27 15:43 ` Linus Walleij 2023-11-29 18:04 ` Vladimir Oltean 2023-11-29 18:04 ` Vladimir Oltean 2023-11-27 15:43 ` [PATCH net-next v9 5/5] dt-bindings: marvell: Add Marvell MV88E6060 DSA schema Linus Walleij 2023-11-27 15:43 ` Linus Walleij 2023-11-30 3:50 ` [PATCH net-next v9 0/5] Create a binding for the Marvell MV88E6xxx DSA switches patchwork-bot+netdevbpf 2023-11-30 3:50 ` patchwork-bot+netdevbpf
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=20231127-marvell-88e6152-wan-led-v9-3-272934e04681@linaro.org \ --to=linus.walleij@linaro.org \ --cc=andrew@lunn.ch \ --cc=ansuelsmth@gmail.com \ --cc=conor+dt@kernel.org \ --cc=davem@davemloft.net \ --cc=devicetree@vger.kernel.org \ --cc=edumazet@google.com \ --cc=f.fainelli@gmail.com \ --cc=gregory.clement@bootlin.com \ --cc=kabel@kernel.org \ --cc=krzysztof.kozlowski+dt@linaro.org \ --cc=kuba@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=netdev@vger.kernel.org \ --cc=olteanv@gmail.com \ --cc=pabeni@redhat.com \ --cc=robh+dt@kernel.org \ --cc=robh@kernel.org \ --cc=sebastian.hesselbarth@gmail.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.