From nobody Wed Dec 17 12:47:20 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75608C4167B for ; Mon, 27 Nov 2023 15:43:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233999AbjK0PnW (ORCPT ); Mon, 27 Nov 2023 10:43:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233834AbjK0PnM (ORCPT ); Mon, 27 Nov 2023 10:43:12 -0500 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC2BD1A3 for ; Mon, 27 Nov 2023 07:43:17 -0800 (PST) Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-507e85ebf50so5907675e87.1 for ; Mon, 27 Nov 2023 07:43:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701099796; x=1701704596; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=laAP022lsP8tLUMRJS12kz9BQh0UCp0+Op3begljKsQ=; b=vHVHU5BE+wa2rc3yh2h9KurgMGJAXDqFpgFzOn864j46a3y/vwsdsK0whyNrHiGx7K OVy3C6i5UFXWaj4QbB1BNUsC9THkKo9Q1u+ccBmfZuM9ZCdnkqAfOOEMHT0yTIPGvO5P f1v7CCDG08mWJbdIaNUMXODIdziRr0NWT2bwAMEzRN6ScIggxwP8PLW8NlcJVUBIlxky zQg+Lx80fwkKFkHjwaH162iMpFg+3kxRDqdT/OU8u10ZwGHK7DGCLhzAp47GCcmKKvfY Vu8iE3G6BF+Wg2pdIsszfPSlhn6J6PoFCt+fB/uaz+tZe4IzPhcnLl10PSi83R2nwUB5 YgAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701099796; x=1701704596; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=laAP022lsP8tLUMRJS12kz9BQh0UCp0+Op3begljKsQ=; b=SvjOnu2kCUGKYgUPgVhyESxz4Nzb94SCuZr/+3g2Y1ppnGbdaiyYuZaX70AH8bCLWX Pisu+kwYZhJ2KeWRPi1N5PlxtFpml+px8+fUZMexa5k54CEPR10ijqFU0BbSXeYLIatG qwsvetqi0JqURwROas/RUqT0mn9T0NY9/sRUtmp74IfRqMyd76yOxQo+AKmtPnf95IoV 8qkNtrdFUZSU0P9yneMMBKwibK2Qlm4Mq/JjnrUxrxwwEnX0PqCsAIcQXCwf0ycUt9Ev emNwBu5tE/b10hHruGja+ORkSqP/7upLqksfBMvv4QZ3d4DwdGdRay2vjFynszRjbC2a UvEA== X-Gm-Message-State: AOJu0YxHQED90XDes1Yr8drixjdeh/83IAPlMA/zaOMwIXV1cPUhLSE9 xugVj+T92Q9xK2csHbIeqsomVex7vHgawwmWCAM= X-Google-Smtp-Source: AGHT+IHYAPIK0kVbirWgTmBfDmamzEa/j5LAyTqDffhpjRhVqj7bTRWcf8vS5bUNEMjEXsL5Dt4YYQ== X-Received: by 2002:a05:6512:3a82:b0:509:489f:d84e with SMTP id q2-20020a0565123a8200b00509489fd84emr11144123lfu.37.1701099796186; Mon, 27 Nov 2023 07:43:16 -0800 (PST) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id v28-20020ac2559c000000b0050ab86037d8sm1505049lfg.205.2023.11.27.07.43.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 07:43:15 -0800 (PST) From: Linus Walleij Date: Mon, 27 Nov 2023 16:43:06 +0100 Subject: [PATCH net-next v9 3/5] dt-bindings: net: ethernet-switch: Accept special variants MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231127-marvell-88e6152-wan-led-v9-3-272934e04681@linaro.org> References: <20231127-marvell-88e6152-wan-led-v9-0-272934e04681@linaro.org> In-Reply-To: <20231127-marvell-88e6152-wan-led-v9-0-272934e04681@linaro.org> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Russell King , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , =?utf-8?q?Marek_Beh=C3=BAn?= Cc: Christian Marangi , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Linus Walleij , Rob Herring X-Mailer: b4 0.12.4 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 Reviewed-by: Andrew Lunn Signed-off-by: Linus Walleij Reviewed-by: Vladimir Oltean --- .../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/D= ocumentation/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: =20 select: false =20 -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(@.*)?$" =20 patternProperties: "^(ethernet-)?ports$": --=20 2.34.1