| Message ID | 20231114-marvell-88e6152-wan-led-v8-6-50688741691b@linaro.org |
|---|---|
| State | Accepted |
| Commit | f45c197465ed92c72c1af7ac773ca5050bd9535a |
| Headers | show |
| Series | Create a binding for the Marvell MV88E6xxx DSA switches | expand |
On Tue, Nov 14, 2023 at 12:36:01AM +0100, Linus Walleij wrote: > 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. > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> As you say, not pretty. But it does the job. Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
On Tue, 14 Nov 2023 00:36:01 +0100, Linus Walleij wrote: > 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. > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > .../devicetree/bindings/net/ethernet-switch.yaml | 23 +++++++++++++++++++--- > 1 file changed, 20 insertions(+), 3 deletions(-) > Reviewed-by: Rob Herring <robh@kernel.org>
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$":
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. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- .../devicetree/bindings/net/ethernet-switch.yaml | 23 +++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)