From nobody Tue Dec 30 17:01:00 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 A8122C4167D for ; Mon, 13 Nov 2023 23:36:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231842AbjKMXgH (ORCPT ); Mon, 13 Nov 2023 18:36:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51628 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230437AbjKMXgF (ORCPT ); Mon, 13 Nov 2023 18:36:05 -0500 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF67AD71 for ; Mon, 13 Nov 2023 15:36:00 -0800 (PST) Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2c79d8b67f3so53361311fa.0 for ; Mon, 13 Nov 2023 15:36:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699918559; x=1700523359; 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=VuNdy95VNpWQjRKNnpzeQQ54Hlq4tpuG2i9HfgCgKck=; b=ZWk9YWnAIILC5S/hmsCw/pV/GPcrxB4VbupyLbglHBtUkXGtEJiJp2K7MC8P7e1Eq4 ZifiLlUgoDrm+byqiQCFGi4APAzigOsPqLer9i26xrkKs9rx5IdkkuteSQhHwtq1YYf5 ISIiK40dBqbzMrMpHXJ71WJnCdDzLwnkrGuteyw8FnlQpPadma591KgjXLrR8Ncrpkww 4m59XyJpMJo6GO5oO9Zmk+GBZQ7g/hfZiGbTLdmUzHt4UH+33R9a6ZtVuT5cNgiS0tqc 8CImP9eJ0CNeAssYb8vWYqedxE6319UZlj4pYbt0y66/ilTU7lG6E39y+qvRqsqmmcTs PDbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699918559; x=1700523359; 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=VuNdy95VNpWQjRKNnpzeQQ54Hlq4tpuG2i9HfgCgKck=; b=dGsml3pkjcfW0IeFvW8M9FTX5FR1WgGLA9oUxm7YWshWWkWKHCIL9pm+C4tFbZ6+Zq VX0gANEIL37pTLAFQl1Ib/NN57bYZ8pJ40a7+aTStBswMtwmYKQd3qFKKxuA9j5YmSTn iIx6f6NWsr/epenILM48wMTcHGGYwun/Y8w2PWTD7kFDwZ+yO9g3QvBMOwg78ikdFYXY XOBhKfqrapCtJ+/QSa3qjVecnfRlKQ/T+ekhzpYctGlwq28QCG+rUS1ZKOFMaLlQnQVF 1yvQ1d9pZz0a2KEDpb/zX7rGHJK2IPQYUog01bBpOulFKLqwXz85v6I9yRIjF2w6PO/G zK0A== X-Gm-Message-State: AOJu0YwZitJz4+NKXj4tf+AAK6N27ZTZ6X+Ct0485LRRxS99rji6HsgP Sg1rFID3sFv7ClWGBRi1VFRxIQ== X-Google-Smtp-Source: AGHT+IH+vpWSTfI+TqOPfDKq76GtSXfLBIVn7t5E38cxEXvkov/kjCBQrBt7VVuzFvyFnuIoPT3IzA== X-Received: by 2002:a2e:1659:0:b0:2c5:169f:ff03 with SMTP id 25-20020a2e1659000000b002c5169fff03mr475738ljw.5.1699918558910; Mon, 13 Nov 2023 15:35:58 -0800 (PST) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 17-20020a2e0611000000b002b70a8478ddsm1202859ljg.44.2023.11.13.15.35.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 15:35:58 -0800 (PST) From: Linus Walleij Date: Tue, 14 Nov 2023 00:35:56 +0100 Subject: [PATCH net-next v8 1/9] dt-bindings: net: dsa: Require ports or ethernet-ports MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231114-marvell-88e6152-wan-led-v8-1-50688741691b@linaro.org> References: <20231114-marvell-88e6152-wan-led-v8-0-50688741691b@linaro.org> In-Reply-To: <20231114-marvell-88e6152-wan-led-v8-0-50688741691b@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 , Florian Fainelli , Krzysztof Kozlowski X-Mailer: b4 0.12.4 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Bindings using dsa.yaml#/$defs/ethernet-ports specify that a DSA switch node need to have a ports or ethernet-ports subnode, and that is actually required, so add requirements using oneOf. Suggested-by: Rob Herring Acked-by: Florian Fainelli Reviewed-by: Krzysztof Kozlowski Signed-off-by: Linus Walleij --- Documentation/devicetree/bindings/net/dsa/dsa.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/net/dsa/dsa.yaml b/Documenta= tion/devicetree/bindings/net/dsa/dsa.yaml index 6107189d276a..2abd036578d1 100644 --- a/Documentation/devicetree/bindings/net/dsa/dsa.yaml +++ b/Documentation/devicetree/bindings/net/dsa/dsa.yaml @@ -46,4 +46,10 @@ $defs: $ref: dsa-port.yaml# unevaluatedProperties: false =20 +oneOf: + - required: + - ports + - required: + - ethernet-ports + ... --=20 2.34.1 From nobody Tue Dec 30 17:01:00 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 6EFF0C4167D for ; Mon, 13 Nov 2023 23:36:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231926AbjKMXgK (ORCPT ); Mon, 13 Nov 2023 18:36:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230366AbjKMXgF (ORCPT ); Mon, 13 Nov 2023 18:36:05 -0500 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C24A099 for ; Mon, 13 Nov 2023 15:36:01 -0800 (PST) Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2c6efcef4eeso66132301fa.1 for ; Mon, 13 Nov 2023 15:36:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699918560; x=1700523360; 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=h0VwY6TaHpxI3borUCq3aH1TpiyNiMcQ1rckV7olnsw=; b=U9ImV95lJRVZr6lVFdXEKaSXFGkCDZ218h6yhSrox3gLbV0bWUOruvU4RwaAxTd+k0 348VFN6XDluKPw+FPSzxfmUkVZ5SDbFHVq6TnhPrzL2rvDgqC3Yk8uIMmSGJt4yY+ZjS qFHH2kqgiB2icbDWNWzNCWAHKyazXcA3Ov0AZqOqJTr7EpiF9GIdd0W9JgyakUkLtVpk akWgv8kY7FxI6P39GgRxxtxAUGcEykLIZopolppVm2hbd828Vt6xey58qIymt+9r2BCo aEJhgXUsuMpy3Z7TSM186tZS2TzxblsK46m2NPWH2o8esTbfy/H4P9pvQ6Lk4gCfJl41 wg6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699918560; x=1700523360; 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=h0VwY6TaHpxI3borUCq3aH1TpiyNiMcQ1rckV7olnsw=; b=V6bQakLJPSu7huGNi2Ur1FmubYf+tz1Y5PL2W0IGvvkziT9hu/jbDv/Srzg4QEPU1K ciCX7BHgnp3yWASSds6GvU/Lhkyj8tWNiDan8tWhWWfMmRFD1Gx4qmwtSk7k9qPem0zh uyO7oW/PR0jQZWiIE4KKJMuzHDfqoMfZCQJ2Y17uTssBd8zkopsJGIxQ++r2PAV8Jzw4 kjqEoTxzsx2c2YpZmTEfMLWjS3JAr2y+zJ+LhqH8ZJIuxyepV5L9ZBQaspM3CckTKqWa 1Ex1DHCaKGnknT8scBmODmZXnscSxk3PCc8ufdw6vdAkSuLK4SkaVDrrJXFOW8F6tnpN CKsw== X-Gm-Message-State: AOJu0YzWFWxct6g+1yvKAHvAIZF1ClWO4LJDyKiyVioGY7YGDXuUg1/p Oo6LVXEjGIVXgOx71yZNcUtvWw== X-Google-Smtp-Source: AGHT+IE6N7o4JJ2tj/eDgllrzti0scb8e37t/wSl6LTid0qJhAUkHyoCVWNBKRdo9x/Ix//9+Gy9cQ== X-Received: by 2002:a05:651c:120a:b0:2c8:3b99:7f09 with SMTP id i10-20020a05651c120a00b002c83b997f09mr471644lja.0.1699918560053; Mon, 13 Nov 2023 15:36:00 -0800 (PST) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 17-20020a2e0611000000b002b70a8478ddsm1202859ljg.44.2023.11.13.15.35.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 15:35:59 -0800 (PST) From: Linus Walleij Date: Tue, 14 Nov 2023 00:35:57 +0100 Subject: [PATCH net-next v8 2/9] dt-bindings: net: mvusb: Fix up DSA example MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231114-marvell-88e6152-wan-led-v8-2-50688741691b@linaro.org> References: <20231114-marvell-88e6152-wan-led-v8-0-50688741691b@linaro.org> In-Reply-To: <20231114-marvell-88e6152-wan-led-v8-0-50688741691b@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 , Vladimir Oltean , Rob Herring , Florian Fainelli X-Mailer: b4 0.12.4 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When adding a proper schema for the Marvell mx88e6xxx switch, the scripts start complaining about this embedded example: dtschema/dtc warnings/errors: net/marvell,mvusb.example.dtb: switch@0: ports: '#address-cells' is a required property from schema $id: http://devicetree.org/schemas/net/dsa/marvell,mv88e6xxx.= yaml# net/marvell,mvusb.example.dtb: switch@0: ports: '#size-cells' is a required property from schema $id: http://devicetree.org/schemas/net/dsa/marvell,mv88e6xxx.= yaml# Fix this up by extending the example with those properties in the ports node. While we are at it, rename "ports" to "ethernet-ports" and rename "switch" to "ethernet-switch" as this is recommended practice. Reviewed-by: Andrew Lunn Reviewed-by: Vladimir Oltean Reviewed-by: Rob Herring Reviewed-by: Florian Fainelli Signed-off-by: Linus Walleij --- Documentation/devicetree/bindings/net/marvell,mvusb.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/net/marvell,mvusb.yaml b/Doc= umentation/devicetree/bindings/net/marvell,mvusb.yaml index 3a3325168048..ab838c1ffeed 100644 --- a/Documentation/devicetree/bindings/net/marvell,mvusb.yaml +++ b/Documentation/devicetree/bindings/net/marvell,mvusb.yaml @@ -50,11 +50,14 @@ examples: #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch@0 { + ethernet-switch@0 { compatible =3D "marvell,mv88e6190"; reg =3D <0x0>; =20 - ports { + ethernet-ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + /* Port definitions */ }; =20 --=20 2.34.1 From nobody Tue Dec 30 17:01:00 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 58ED3C4332F for ; Mon, 13 Nov 2023 23:36:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231995AbjKMXgT (ORCPT ); Mon, 13 Nov 2023 18:36:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231713AbjKMXgH (ORCPT ); Mon, 13 Nov 2023 18:36:07 -0500 Received: from mail-lj1-x230.google.com (mail-lj1-x230.google.com [IPv6:2a00:1450:4864:20::230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C89C2D73 for ; Mon, 13 Nov 2023 15:36:02 -0800 (PST) Received: by mail-lj1-x230.google.com with SMTP id 38308e7fff4ca-2c50cf61f6dso69790591fa.2 for ; Mon, 13 Nov 2023 15:36:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699918561; x=1700523361; 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=fFEG72dBWYWsZUqmejoV0kt4Aj1zmT269T2kGi/rvFE=; b=cfIh0ft/c4RPIUf7lgrEzH37Qs67Hx/J/InZB114j91YjRzS2hcKz6GG6h/Qv/80jv JlpacTJOsmWeg5GC5dvaGB3ksAe0EHBEoPG1398VWYLbCBGf0bw8Rjc7hWn27zWDP9dB ytJrmEAx2qeQunna53u8Yk6CAeAZHiBUCTKM6qhbYhrE4Rkv+cnGfiiAQbrLtRvEaMmx H86p+oirK6/xOG20lpu81i72fCRLl+RAHRj6eMJoxAKGMeozof+0FQ2+e3djHGpfL1qg 6pMk+7HjouVIwI8pSqVz6DLkK67UE+DjOzbm2m5KJn+lYRSQlfqmFlDN3PYVy/io+XrK 4cgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699918561; x=1700523361; 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=fFEG72dBWYWsZUqmejoV0kt4Aj1zmT269T2kGi/rvFE=; b=a/aLnTIDndt1sjgueiZLqBo7ox0du0YnVEEt8o1Ke947OmOJvS/RSLSWH8lYy5X83/ gEGU6+ZGcVrduYAQjN2si6bGZgr+TQfhPQMaCxqVNvbrsHm6D+4RaTYpAInXgQa7Msva RVxU6cY3f4a7bbDP18CmUZWdB9wJS7hgetW4eMw0B8t9jk/D6+s1EXjGNKAi6aOKQGEJ m9+KeqN7LV9u0BwLfYzljBhtTPc15apwNskse7w6nN7WAOP8Bdhhu7Muf+VrEF4ifqcu EWzqAoTVl7pIjuFfST9S+9wR4g2EoezA36mWQW9+uVn40vQLkWdDmxbCQzgSXaJeAhNz F37w== X-Gm-Message-State: AOJu0YxIPZOGgA+IaL/s47DRowbhOoaL+iVwRP1QSXOyBxPvHb/W2tJ/ Y/VSXoG4DkP94xaetRh3SnkTMQ== X-Google-Smtp-Source: AGHT+IHsxpzN1LwX0uHjACVOlXRRCh/qdwpBLxQITo7fbX1vKxySCKj4NH7WuHYVQ64JZUrQjBbUMA== X-Received: by 2002:a2e:8849:0:b0:2c8:2e3a:e974 with SMTP id z9-20020a2e8849000000b002c82e3ae974mr563412ljj.44.1699918561110; Mon, 13 Nov 2023 15:36:01 -0800 (PST) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 17-20020a2e0611000000b002b70a8478ddsm1202859ljg.44.2023.11.13.15.36.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 15:36:00 -0800 (PST) From: Linus Walleij Date: Tue, 14 Nov 2023 00:35:58 +0100 Subject: [PATCH net-next v8 3/9] ARM: dts: marvell: Fix some common switch mistakes MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231114-marvell-88e6152-wan-led-v8-3-50688741691b@linaro.org> References: <20231114-marvell-88e6152-wan-led-v8-0-50688741691b@linaro.org> In-Reply-To: <20231114-marvell-88e6152-wan-led-v8-0-50688741691b@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 , Florian Fainelli X-Mailer: b4 0.12.4 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix some errors in the Marvell MV88E6xxx switch descriptions: - The top node had no address size or cells. - switch0@0 is not OK, should be ethernet-switch@0. - The ports node should be named ethernet-ports - The ethernet-ports node should have port@0 etc children, no plural "ports" in the children. - Ports should be named ethernet-port@0 etc - PHYs should be named ethernet-phy@0 etc This serves as an example of fixes needed for introducing a schema for the bindings, but the patch can simply be applied. Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli Signed-off-by: Linus Walleij Reviewed-by: Vladimir Oltean --- arch/arm/boot/dts/marvell/armada-370-rd.dts | 24 ++++++------ .../dts/marvell/armada-381-netgear-gs110emx.dts | 44 +++++++++++-------= ---- .../dts/marvell/armada-385-clearfog-gtr-l8.dts | 38 +++++++++---------- .../dts/marvell/armada-385-clearfog-gtr-s4.dts | 22 +++++------ arch/arm/boot/dts/marvell/armada-385-linksys.dtsi | 18 ++++----- .../boot/dts/marvell/armada-385-turris-omnia.dts | 20 +++++----- arch/arm/boot/dts/marvell/armada-388-clearfog.dts | 20 +++++----- .../boot/dts/marvell/armada-xp-linksys-mamba.dts | 18 ++++----- 8 files changed, 96 insertions(+), 108 deletions(-) diff --git a/arch/arm/boot/dts/marvell/armada-370-rd.dts b/arch/arm/boot/dt= s/marvell/armada-370-rd.dts index b459a670f615..1b241da11e94 100644 --- a/arch/arm/boot/dts/marvell/armada-370-rd.dts +++ b/arch/arm/boot/dts/marvell/armada-370-rd.dts @@ -149,39 +149,37 @@ led@0 { }; }; =20 - switch: switch@10 { + switch: ethernet-switch@10 { compatible =3D "marvell,mv88e6085"; - #address-cells =3D <1>; - #size-cells =3D <0>; reg =3D <0x10>; interrupt-controller; #interrupt-cells =3D <2>; =20 - ports { + ethernet-ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 - port@0 { + ethernet-port@0 { reg =3D <0>; label =3D "lan0"; }; =20 - port@1 { + ethernet-port@1 { reg =3D <1>; label =3D "lan1"; }; =20 - port@2 { + ethernet-port@2 { reg =3D <2>; label =3D "lan2"; }; =20 - port@3 { + ethernet-port@3 { reg =3D <3>; label =3D "lan3"; }; =20 - port@5 { + ethernet-port@5 { reg =3D <5>; ethernet =3D <ð1>; phy-mode =3D "rgmii-id"; @@ -196,25 +194,25 @@ mdio { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switchphy0: switchphy@0 { + switchphy0: ethernet-phy@0 { reg =3D <0>; interrupt-parent =3D <&switch>; interrupts =3D <0 IRQ_TYPE_LEVEL_HIGH>; }; =20 - switchphy1: switchphy@1 { + switchphy1: ethernet-phy@1 { reg =3D <1>; interrupt-parent =3D <&switch>; interrupts =3D <1 IRQ_TYPE_LEVEL_HIGH>; }; =20 - switchphy2: switchphy@2 { + switchphy2: ethernet-phy@2 { reg =3D <2>; interrupt-parent =3D <&switch>; interrupts =3D <2 IRQ_TYPE_LEVEL_HIGH>; }; =20 - switchphy3: switchphy@3 { + switchphy3: ethernet-phy@3 { reg =3D <3>; interrupt-parent =3D <&switch>; interrupts =3D <3 IRQ_TYPE_LEVEL_HIGH>; diff --git a/arch/arm/boot/dts/marvell/armada-381-netgear-gs110emx.dts b/ar= ch/arm/boot/dts/marvell/armada-381-netgear-gs110emx.dts index f4c4b213ef4e..5baf83e5253d 100644 --- a/arch/arm/boot/dts/marvell/armada-381-netgear-gs110emx.dts +++ b/arch/arm/boot/dts/marvell/armada-381-netgear-gs110emx.dts @@ -77,51 +77,49 @@ &mdio { pinctrl-0 =3D <&mdio_pins>; status =3D "okay"; =20 - switch@0 { + ethernet-switch@0 { compatible =3D "marvell,mv88e6190"; - #address-cells =3D <1>; #interrupt-cells =3D <2>; interrupt-controller; interrupt-parent =3D <&gpio1>; interrupts =3D <7 IRQ_TYPE_LEVEL_LOW>; pinctrl-0 =3D <&switch_interrupt_pins>; pinctrl-names =3D "default"; - #size-cells =3D <0>; reg =3D <0>; =20 mdio { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch0phy1: switch0phy1@1 { + switch0phy1: ethernet-phy@1 { reg =3D <0x1>; }; =20 - switch0phy2: switch0phy2@2 { + switch0phy2: ethernet-phy@2 { reg =3D <0x2>; }; =20 - switch0phy3: switch0phy3@3 { + switch0phy3: ethernet-phy@3 { reg =3D <0x3>; }; =20 - switch0phy4: switch0phy4@4 { + switch0phy4: ethernet-phy@4 { reg =3D <0x4>; }; =20 - switch0phy5: switch0phy5@5 { + switch0phy5: ethernet-phy@5 { reg =3D <0x5>; }; =20 - switch0phy6: switch0phy6@6 { + switch0phy6: ethernet-phy@6 { reg =3D <0x6>; }; =20 - switch0phy7: switch0phy7@7 { + switch0phy7: ethernet-phy@7 { reg =3D <0x7>; }; =20 - switch0phy8: switch0phy8@8 { + switch0phy8: ethernet-phy@8 { reg =3D <0x8>; }; }; @@ -142,11 +140,11 @@ phy2: ethernet-phy@c { }; }; =20 - ports { + ethernet-ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 - port@0 { + ethernet-port@0 { ethernet =3D <ð0>; phy-mode =3D "rgmii"; reg =3D <0>; @@ -158,55 +156,55 @@ fixed-link { }; }; =20 - port@1 { + ethernet-port@1 { label =3D "lan1"; phy-handle =3D <&switch0phy1>; reg =3D <1>; }; =20 - port@2 { + ethernet-port@2 { label =3D "lan2"; phy-handle =3D <&switch0phy2>; reg =3D <2>; }; =20 - port@3 { + ethernet-port@3 { label =3D "lan3"; phy-handle =3D <&switch0phy3>; reg =3D <3>; }; =20 - port@4 { + ethernet-port@4 { label =3D "lan4"; phy-handle =3D <&switch0phy4>; reg =3D <4>; }; =20 - port@5 { + ethernet-port@5 { label =3D "lan5"; phy-handle =3D <&switch0phy5>; reg =3D <5>; }; =20 - port@6 { + ethernet-port@6 { label =3D "lan6"; phy-handle =3D <&switch0phy6>; reg =3D <6>; }; =20 - port@7 { + ethernet-port@7 { label =3D "lan7"; phy-handle =3D <&switch0phy7>; reg =3D <7>; }; =20 - port@8 { + ethernet-port@8 { label =3D "lan8"; phy-handle =3D <&switch0phy8>; reg =3D <8>; }; =20 - port@9 { + ethernet-port@9 { /* 88X3310P external phy */ label =3D "lan9"; phy-handle =3D <&phy1>; @@ -214,7 +212,7 @@ port@9 { reg =3D <9>; }; =20 - port@a { + ethernet-port@a { /* 88X3310P external phy */ label =3D "lan10"; phy-handle =3D <&phy2>; diff --git a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts b/arc= h/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts index 1990f7d0cc79..1707d1b01545 100644 --- a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts +++ b/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts @@ -7,66 +7,66 @@ / { }; =20 &mdio { - switch0: switch0@4 { + switch0: ethernet-switch@4 { compatible =3D "marvell,mv88e6190"; reg =3D <4>; pinctrl-names =3D "default"; pinctrl-0 =3D <&cf_gtr_switch_reset_pins>; reset-gpios =3D <&gpio0 18 GPIO_ACTIVE_LOW>; =20 - ports { + ethernet-ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 - port@1 { + ethernet-port@1 { reg =3D <1>; label =3D "lan8"; phy-handle =3D <&switch0phy0>; }; =20 - port@2 { + ethernet-port@2 { reg =3D <2>; label =3D "lan7"; phy-handle =3D <&switch0phy1>; }; =20 - port@3 { + ethernet-port@3 { reg =3D <3>; label =3D "lan6"; phy-handle =3D <&switch0phy2>; }; =20 - port@4 { + ethernet-port@4 { reg =3D <4>; label =3D "lan5"; phy-handle =3D <&switch0phy3>; }; =20 - port@5 { + ethernet-port@5 { reg =3D <5>; label =3D "lan4"; phy-handle =3D <&switch0phy4>; }; =20 - port@6 { + ethernet-port@6 { reg =3D <6>; label =3D "lan3"; phy-handle =3D <&switch0phy5>; }; =20 - port@7 { + ethernet-port@7 { reg =3D <7>; label =3D "lan2"; phy-handle =3D <&switch0phy6>; }; =20 - port@8 { + ethernet-port@8 { reg =3D <8>; label =3D "lan1"; phy-handle =3D <&switch0phy7>; }; =20 - port@10 { + ethernet-port@10 { reg =3D <10>; phy-mode =3D "2500base-x"; =20 @@ -83,35 +83,35 @@ mdio { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch0phy0: switch0phy0@1 { + switch0phy0: ethernet-phy@1 { reg =3D <0x1>; }; =20 - switch0phy1: switch0phy1@2 { + switch0phy1: ethernet-phy@2 { reg =3D <0x2>; }; =20 - switch0phy2: switch0phy2@3 { + switch0phy2: ethernet-phy@3 { reg =3D <0x3>; }; =20 - switch0phy3: switch0phy3@4 { + switch0phy3: ethernet-phy@4 { reg =3D <0x4>; }; =20 - switch0phy4: switch0phy4@5 { + switch0phy4: ethernet-phy@5 { reg =3D <0x5>; }; =20 - switch0phy5: switch0phy5@6 { + switch0phy5: ethernet-phy@6 { reg =3D <0x6>; }; =20 - switch0phy6: switch0phy6@7 { + switch0phy6: ethernet-phy@7 { reg =3D <0x7>; }; =20 - switch0phy7: switch0phy7@8 { + switch0phy7: ethernet-phy@8 { reg =3D <0x8>; }; }; diff --git a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts b/arc= h/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts index b795ad573891..a7678a784c18 100644 --- a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts +++ b/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts @@ -11,42 +11,42 @@ &sfp0 { }; =20 &mdio { - switch0: switch0@4 { + switch0: ethernet-switch@4 { compatible =3D "marvell,mv88e6085"; reg =3D <4>; pinctrl-names =3D "default"; pinctrl-0 =3D <&cf_gtr_switch_reset_pins>; reset-gpios =3D <&gpio0 18 GPIO_ACTIVE_LOW>; =20 - ports { + ethernet-ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 - port@1 { + ethernet-port@1 { reg =3D <1>; label =3D "lan2"; phy-handle =3D <&switch0phy0>; }; =20 - port@2 { + ethernet-port@2 { reg =3D <2>; label =3D "lan1"; phy-handle =3D <&switch0phy1>; }; =20 - port@3 { + ethernet-port@3 { reg =3D <3>; label =3D "lan4"; phy-handle =3D <&switch0phy2>; }; =20 - port@4 { + ethernet-port@4 { reg =3D <4>; label =3D "lan3"; phy-handle =3D <&switch0phy3>; }; =20 - port@5 { + ethernet-port@5 { reg =3D <5>; phy-mode =3D "2500base-x"; ethernet =3D <ð1>; @@ -63,19 +63,19 @@ mdio { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch0phy0: switch0phy0@11 { + switch0phy0: ethernet-phy@11 { reg =3D <0x11>; }; =20 - switch0phy1: switch0phy1@12 { + switch0phy1: ethernet-phy@12 { reg =3D <0x12>; }; =20 - switch0phy2: switch0phy2@13 { + switch0phy2: ethernet-phy@13 { reg =3D <0x13>; }; =20 - switch0phy3: switch0phy3@14 { + switch0phy3: ethernet-phy@14 { reg =3D <0x14>; }; }; diff --git a/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi b/arch/arm/b= oot/dts/marvell/armada-385-linksys.dtsi index fc8216fd9f60..4116ed60f709 100644 --- a/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi +++ b/arch/arm/boot/dts/marvell/armada-385-linksys.dtsi @@ -158,42 +158,40 @@ nand: nand@0 { &mdio { status =3D "okay"; =20 - switch@0 { + ethernet-switch@0 { compatible =3D "marvell,mv88e6085"; - #address-cells =3D <1>; - #size-cells =3D <0>; reg =3D <0>; =20 - ports { + ethernet-ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 - port@0 { + ethernet-port@0 { reg =3D <0>; label =3D "lan4"; }; =20 - port@1 { + ethernet-port@1 { reg =3D <1>; label =3D "lan3"; }; =20 - port@2 { + ethernet-port@2 { reg =3D <2>; label =3D "lan2"; }; =20 - port@3 { + ethernet-port@3 { reg =3D <3>; label =3D "lan1"; }; =20 - port@4 { + ethernet-port@4 { reg =3D <4>; label =3D "wan"; }; =20 - port@5 { + ethernet-port@5 { reg =3D <5>; phy-mode =3D "sgmii"; ethernet =3D <ð2>; diff --git a/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts b/arch/a= rm/boot/dts/marvell/armada-385-turris-omnia.dts index 2d8d319bec83..7b755bb4e4e7 100644 --- a/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts +++ b/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts @@ -435,12 +435,10 @@ phy1: ethernet-phy@1 { }; =20 /* Switch MV88E6176 at address 0x10 */ - switch@10 { + ethernet-switch@10 { pinctrl-names =3D "default"; pinctrl-0 =3D <&swint_pins>; compatible =3D "marvell,mv88e6085"; - #address-cells =3D <1>; - #size-cells =3D <0>; =20 dsa,member =3D <0 0>; reg =3D <0x10>; @@ -448,36 +446,36 @@ switch@10 { interrupt-parent =3D <&gpio1>; interrupts =3D <13 IRQ_TYPE_LEVEL_LOW>; =20 - ports { + ethernet-ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 - ports@0 { + ethernet-port@0 { reg =3D <0>; label =3D "lan0"; }; =20 - ports@1 { + ethernet-port@1 { reg =3D <1>; label =3D "lan1"; }; =20 - ports@2 { + ethernet-port@2 { reg =3D <2>; label =3D "lan2"; }; =20 - ports@3 { + ethernet-port@3 { reg =3D <3>; label =3D "lan3"; }; =20 - ports@4 { + ethernet-port@4 { reg =3D <4>; label =3D "lan4"; }; =20 - ports@5 { + ethernet-port@5 { reg =3D <5>; ethernet =3D <ð1>; phy-mode =3D "rgmii-id"; @@ -488,7 +486,7 @@ fixed-link { }; }; =20 - ports@6 { + ethernet-port@6 { reg =3D <6>; ethernet =3D <ð0>; phy-mode =3D "rgmii-id"; diff --git a/arch/arm/boot/dts/marvell/armada-388-clearfog.dts b/arch/arm/b= oot/dts/marvell/armada-388-clearfog.dts index 32c569df142f..3290ccad2374 100644 --- a/arch/arm/boot/dts/marvell/armada-388-clearfog.dts +++ b/arch/arm/boot/dts/marvell/armada-388-clearfog.dts @@ -92,44 +92,42 @@ pcie2-0-w-disable-hog { &mdio { status =3D "okay"; =20 - switch@4 { + ethernet-switch@4 { compatible =3D "marvell,mv88e6085"; - #address-cells =3D <1>; - #size-cells =3D <0>; reg =3D <4>; pinctrl-0 =3D <&clearfog_dsa0_clk_pins &clearfog_dsa0_pins>; pinctrl-names =3D "default"; =20 - ports { + ethernet-ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 - port@0 { + ethernet-port@0 { reg =3D <0>; label =3D "lan5"; }; =20 - port@1 { + ethernet-port@1 { reg =3D <1>; label =3D "lan4"; }; =20 - port@2 { + ethernet-port@2 { reg =3D <2>; label =3D "lan3"; }; =20 - port@3 { + ethernet-port@3 { reg =3D <3>; label =3D "lan2"; }; =20 - port@4 { + ethernet-port@4 { reg =3D <4>; label =3D "lan1"; }; =20 - port@5 { + ethernet-port@5 { reg =3D <5>; ethernet =3D <ð1>; phy-mode =3D "1000base-x"; @@ -140,7 +138,7 @@ fixed-link { }; }; =20 - port@6 { + ethernet-port@6 { /* 88E1512 external phy */ reg =3D <6>; label =3D "lan6"; diff --git a/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts b/arch/a= rm/boot/dts/marvell/armada-xp-linksys-mamba.dts index 7a0614fd0c93..ea859f7ea042 100644 --- a/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts +++ b/arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts @@ -265,42 +265,40 @@ flash@0 { &mdio { status =3D "okay"; =20 - switch@0 { + ethernet-switch@0 { compatible =3D "marvell,mv88e6085"; - #address-cells =3D <1>; - #size-cells =3D <0>; reg =3D <0>; =20 - ports { + ethernet-ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 - port@0 { + ethernet-port@0 { reg =3D <0>; label =3D "lan4"; }; =20 - port@1 { + ethernet-port@1 { reg =3D <1>; label =3D "lan3"; }; =20 - port@2 { + ethernet-port@2 { reg =3D <2>; label =3D "lan2"; }; =20 - port@3 { + ethernet-port@3 { reg =3D <3>; label =3D "lan1"; }; =20 - port@4 { + ethernet-port@4 { reg =3D <4>; label =3D "internet"; }; =20 - port@5 { + ethernet-port@5 { reg =3D <5>; phy-mode =3D "rgmii-id"; ethernet =3D <ð0>; --=20 2.34.1 From nobody Tue Dec 30 17:01:00 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 62674C4332F for ; Mon, 13 Nov 2023 23:36:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232090AbjKMXgZ (ORCPT ); Mon, 13 Nov 2023 18:36:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231904AbjKMXgJ (ORCPT ); Mon, 13 Nov 2023 18:36:09 -0500 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00C72D6C for ; Mon, 13 Nov 2023 15:36:03 -0800 (PST) Received: by mail-lj1-x235.google.com with SMTP id 38308e7fff4ca-2c59a4dd14cso60634321fa.2 for ; Mon, 13 Nov 2023 15:36:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699918562; x=1700523362; 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=948RQ39eT96C41vhUgKT9MdtYhGK2zTs/T3B83xBL3Y=; b=v3rQ7EF7X762BteZx2KbDpW69a1DAPR9tcpS+bliF/gltuL7JdfGb6W6MP2y9RGFJm rf1UXovNUHqLDTq9PfNFV6quC/FHM9iw//vurFvtHRGt5bpk4cQT4uyTdzN/Bc6ZFR0X 3MJ+4CKW0P8FEp/UROj/p+8oeqooYZ5GmbmmT6DlZ3ZWinxByArSnh6IaenLGT2I2fTQ UNfJ7jVFJYJp3bO/dmBxWOB9A6QCtXCr6gLyO3o8eD2ktgJp1LVgVoIxN+okXWjeYUQ4 nMtiTzmobmYazuFq4rtX7pFUhwvPqN96nSAHtep/OkGrOm3WXIx9ypMCZ3wltflqw8Nl JiMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699918562; x=1700523362; 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=948RQ39eT96C41vhUgKT9MdtYhGK2zTs/T3B83xBL3Y=; b=JY5pH9ax1pJ/Ah3by+g99mLi0fawSSW3K2oZ/j6Wj00UPj6X3lI4hIlWbbL9R7D8E6 BqH2JI7Fi8DNS6w9adtSIRBKcexBc7PYskZWdfu6GAWhyHC62F2NkmMIIdfSjkUCynN/ pKmkwuiRZS0NpRvkKYe9sOdaaLFzL3e2g5k8RLNg6hoJxrfJZVU8l/APaF5CrxEh+dGg j58oNT3EDPMGaBWZ0xaje1qIn0FZGCdBK0EQdIIpSNUjij1Y3zSE92xGRtHgjdF+FHB0 clGDktInEW0cu27a/VnYf3gLQYes5UpHHQLVluRAaurZXYiSOf28Ixc0cDzJcFYRTtkQ TVTw== X-Gm-Message-State: AOJu0Yw3Tp5IlMMs7GXiFqvOe0N6mesb9iH9la2wSuWOwkI8CHu+j8n9 VSuHwcUOIBGQ4zCE8x2vrt+78g== X-Google-Smtp-Source: AGHT+IHvd4RbVPyBPbtqmg0nX3ooPWiizrvJakxjJpWlji4MDjIIK+vMmyUkNHofrTihAiRUinaNtQ== X-Received: by 2002:a2e:b0e6:0:b0:2c6:ebfb:dd28 with SMTP id h6-20020a2eb0e6000000b002c6ebfbdd28mr472994ljl.0.1699918562269; Mon, 13 Nov 2023 15:36:02 -0800 (PST) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 17-20020a2e0611000000b002b70a8478ddsm1202859ljg.44.2023.11.13.15.36.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 15:36:01 -0800 (PST) From: Linus Walleij Date: Tue, 14 Nov 2023 00:35:59 +0100 Subject: [PATCH net-next v8 4/9] ARM: dts: nxp: Fix some common switch mistakes MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231114-marvell-88e6152-wan-led-v8-4-50688741691b@linaro.org> References: <20231114-marvell-88e6152-wan-led-v8-0-50688741691b@linaro.org> In-Reply-To: <20231114-marvell-88e6152-wan-led-v8-0-50688741691b@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 , Florian Fainelli X-Mailer: b4 0.12.4 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix some errors in the Marvell MV88E6xxx switch descriptions: - switch0@0 is not OK, should be ethernet-switch@0 - ports should be ethernet-ports - port should be ethernet-port - phy should be ethernet-phy Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli Signed-off-by: Linus Walleij Reviewed-by: Vladimir Oltean --- arch/arm/boot/dts/nxp/vf/vf610-zii-cfu1.dts | 14 ++--- arch/arm/boot/dts/nxp/vf/vf610-zii-scu4-aib.dts | 70 ++++++++++++--------= ---- arch/arm/boot/dts/nxp/vf/vf610-zii-spb4.dts | 18 +++--- arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-dtu.dts | 20 +++---- arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-spu3.dts | 18 +++--- 5 files changed, 70 insertions(+), 70 deletions(-) diff --git a/arch/arm/boot/dts/nxp/vf/vf610-zii-cfu1.dts b/arch/arm/boot/dt= s/nxp/vf/vf610-zii-cfu1.dts index 1a19aec8957b..7e72f860c3c5 100644 --- a/arch/arm/boot/dts/nxp/vf/vf610-zii-cfu1.dts +++ b/arch/arm/boot/dts/nxp/vf/vf610-zii-cfu1.dts @@ -162,7 +162,7 @@ mdio1: mdio { suppress-preamble; status =3D "okay"; =20 - switch0: switch0@0 { + switch0: ethernet-switch@0 { compatible =3D "marvell,mv88e6085"; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_switch>; @@ -173,26 +173,26 @@ switch0: switch0@0 { interrupt-controller; #interrupt-cells =3D <2>; =20 - ports { + ethernet-ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 - port@0 { + ethernet-port@0 { reg =3D <0>; label =3D "eth_cu_1000_1"; }; =20 - port@1 { + ethernet-port@1 { reg =3D <1>; label =3D "eth_cu_1000_2"; }; =20 - port@2 { + ethernet-port@2 { reg =3D <2>; label =3D "eth_cu_1000_3"; }; =20 - port@5 { + ethernet-port@5 { reg =3D <5>; label =3D "eth_fc_1000_1"; phy-mode =3D "1000base-x"; @@ -200,7 +200,7 @@ port@5 { sfp =3D <&sff>; }; =20 - port@6 { + ethernet-port@6 { reg =3D <6>; phy-mode =3D "rmii"; ethernet =3D <&fec1>; diff --git a/arch/arm/boot/dts/nxp/vf/vf610-zii-scu4-aib.dts b/arch/arm/boo= t/dts/nxp/vf/vf610-zii-scu4-aib.dts index df1335492a19..77492eeea450 100644 --- a/arch/arm/boot/dts/nxp/vf/vf610-zii-scu4-aib.dts +++ b/arch/arm/boot/dts/nxp/vf/vf610-zii-scu4-aib.dts @@ -47,17 +47,17 @@ mdio_mux_1: mdio@1 { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch0: switch0@0 { + switch0: ethernet-switch@0 { compatible =3D "marvell,mv88e6190"; reg =3D <0>; dsa,member =3D <0 0>; eeprom-length =3D <65536>; =20 - ports { + ethernet-ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 - port@0 { + ethernet-port@0 { reg =3D <0>; phy-mode =3D "rmii"; ethernet =3D <&fec1>; @@ -68,37 +68,37 @@ fixed-link { }; }; =20 - port@1 { + ethernet-port@1 { reg =3D <1>; label =3D "aib2main_1"; }; =20 - port@2 { + ethernet-port@2 { reg =3D <2>; label =3D "aib2main_2"; }; =20 - port@3 { + ethernet-port@3 { reg =3D <3>; label =3D "eth_cu_1000_5"; }; =20 - port@4 { + ethernet-port@4 { reg =3D <4>; label =3D "eth_cu_1000_6"; }; =20 - port@5 { + ethernet-port@5 { reg =3D <5>; label =3D "eth_cu_1000_4"; }; =20 - port@6 { + ethernet-port@6 { reg =3D <6>; label =3D "eth_cu_1000_7"; }; =20 - port@7 { + ethernet-port@7 { reg =3D <7>; label =3D "modem_pic"; =20 @@ -108,7 +108,7 @@ fixed-link { }; }; =20 - switch0port10: port@10 { + switch0port10: ethernet-port@10 { reg =3D <10>; label =3D "dsa"; phy-mode =3D "xgmii"; @@ -130,32 +130,32 @@ mdio_mux_2: mdio@2 { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch1: switch1@0 { + switch1: ethernet-switch@0 { compatible =3D "marvell,mv88e6190"; reg =3D <0>; dsa,member =3D <0 1>; eeprom-length =3D <65536>; =20 - ports { + ethernet-ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 - port@1 { + ethernet-port@1 { reg =3D <1>; label =3D "eth_cu_1000_3"; }; =20 - port@2 { + ethernet-port@2 { reg =3D <2>; label =3D "eth_cu_100_2"; }; =20 - port@3 { + ethernet-port@3 { reg =3D <3>; label =3D "eth_cu_100_3"; }; =20 - switch1port9: port@9 { + switch1port9: ethernet-port@9 { reg =3D <9>; label =3D "dsa"; phy-mode =3D "xgmii"; @@ -168,7 +168,7 @@ fixed-link { }; }; =20 - switch1port10: port@10 { + switch1port10: ethernet-port@10 { reg =3D <10>; label =3D "dsa"; phy-mode =3D "xgmii"; @@ -188,17 +188,17 @@ mdio_mux_4: mdio@4 { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch2: switch2@0 { + switch2: ethernet-switch@0 { compatible =3D "marvell,mv88e6190"; reg =3D <0>; dsa,member =3D <0 2>; eeprom-length =3D <65536>; =20 - ports { + ethernet-ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 - port@2 { + ethernet-port@2 { reg =3D <2>; label =3D "eth_fc_1000_2"; phy-mode =3D "1000base-x"; @@ -206,7 +206,7 @@ port@2 { sfp =3D <&sff1>; }; =20 - port@3 { + ethernet-port@3 { reg =3D <3>; label =3D "eth_fc_1000_3"; phy-mode =3D "1000base-x"; @@ -214,7 +214,7 @@ port@3 { sfp =3D <&sff2>; }; =20 - port@4 { + ethernet-port@4 { reg =3D <4>; label =3D "eth_fc_1000_4"; phy-mode =3D "1000base-x"; @@ -222,7 +222,7 @@ port@4 { sfp =3D <&sff3>; }; =20 - port@5 { + ethernet-port@5 { reg =3D <5>; label =3D "eth_fc_1000_5"; phy-mode =3D "1000base-x"; @@ -230,7 +230,7 @@ port@5 { sfp =3D <&sff4>; }; =20 - port@6 { + ethernet-port@6 { reg =3D <6>; label =3D "eth_fc_1000_6"; phy-mode =3D "1000base-x"; @@ -238,7 +238,7 @@ port@6 { sfp =3D <&sff5>; }; =20 - port@7 { + ethernet-port@7 { reg =3D <7>; label =3D "eth_fc_1000_7"; phy-mode =3D "1000base-x"; @@ -246,7 +246,7 @@ port@7 { sfp =3D <&sff6>; }; =20 - port@9 { + ethernet-port@9 { reg =3D <9>; label =3D "eth_fc_1000_1"; phy-mode =3D "1000base-x"; @@ -254,7 +254,7 @@ port@9 { sfp =3D <&sff0>; }; =20 - switch2port10: port@10 { + switch2port10: ethernet-port@10 { reg =3D <10>; label =3D "dsa"; phy-mode =3D "2500base-x"; @@ -276,17 +276,17 @@ mdio_mux_8: mdio@8 { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch3: switch3@0 { + switch3: ethernet-switch@0 { compatible =3D "marvell,mv88e6190"; reg =3D <0>; dsa,member =3D <0 3>; eeprom-length =3D <65536>; =20 - ports { + ethernet-ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 - port@2 { + ethernet-port@2 { reg =3D <2>; label =3D "eth_fc_1000_8"; phy-mode =3D "1000base-x"; @@ -294,7 +294,7 @@ port@2 { sfp =3D <&sff7>; }; =20 - port@3 { + ethernet-port@3 { reg =3D <3>; label =3D "eth_fc_1000_9"; phy-mode =3D "1000base-x"; @@ -302,7 +302,7 @@ port@3 { sfp =3D <&sff8>; }; =20 - port@4 { + ethernet-port@4 { reg =3D <4>; label =3D "eth_fc_1000_10"; phy-mode =3D "1000base-x"; @@ -310,7 +310,7 @@ port@4 { sfp =3D <&sff9>; }; =20 - switch3port9: port@9 { + switch3port9: ethernet-port@9 { reg =3D <9>; label =3D "dsa"; phy-mode =3D "2500base-x"; @@ -322,7 +322,7 @@ fixed-link { }; }; =20 - switch3port10: port@10 { + switch3port10: ethernet-port@10 { reg =3D <10>; label =3D "dsa"; phy-mode =3D "xgmii"; diff --git a/arch/arm/boot/dts/nxp/vf/vf610-zii-spb4.dts b/arch/arm/boot/dt= s/nxp/vf/vf610-zii-spb4.dts index 1461804ecaea..2a490464660c 100644 --- a/arch/arm/boot/dts/nxp/vf/vf610-zii-spb4.dts +++ b/arch/arm/boot/dts/nxp/vf/vf610-zii-spb4.dts @@ -123,7 +123,7 @@ mdio1: mdio { suppress-preamble; status =3D "okay"; =20 - switch0: switch0@0 { + switch0: ethernet-switch@0 { compatible =3D "marvell,mv88e6190"; pinctrl-0 =3D <&pinctrl_gpio_switch0>; pinctrl-names =3D "default"; @@ -134,11 +134,11 @@ switch0: switch0@0 { interrupt-controller; #interrupt-cells =3D <2>; =20 - ports { + ethernet-ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 - port@0 { + ethernet-port@0 { reg =3D <0>; phy-mode =3D "rmii"; ethernet =3D <&fec1>; @@ -149,32 +149,32 @@ fixed-link { }; }; =20 - port@1 { + ethernet-port@1 { reg =3D <1>; label =3D "eth_cu_1000_1"; }; =20 - port@2 { + ethernet-port@2 { reg =3D <2>; label =3D "eth_cu_1000_2"; }; =20 - port@3 { + ethernet-port@3 { reg =3D <3>; label =3D "eth_cu_1000_3"; }; =20 - port@4 { + ethernet-port@4 { reg =3D <4>; label =3D "eth_cu_1000_4"; }; =20 - port@5 { + ethernet-port@5 { reg =3D <5>; label =3D "eth_cu_1000_5"; }; =20 - port@6 { + ethernet-port@6 { reg =3D <6>; label =3D "eth_cu_1000_6"; }; diff --git a/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-dtu.dts b/arch/arm/boo= t/dts/nxp/vf/vf610-zii-ssmb-dtu.dts index 463c2452b9b7..078d8699e16d 100644 --- a/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-dtu.dts +++ b/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-dtu.dts @@ -112,7 +112,7 @@ mdio1: mdio { suppress-preamble; status =3D "okay"; =20 - switch0: switch0@0 { + switch0: ethernet-switch@0 { compatible =3D "marvell,mv88e6190"; pinctrl-0 =3D <&pinctrl_gpio_switch0>; pinctrl-names =3D "default"; @@ -123,11 +123,11 @@ switch0: switch0@0 { interrupt-controller; #interrupt-cells =3D <2>; =20 - ports { + ethernet-ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 - port@0 { + ethernet-port@0 { reg =3D <0>; phy-mode =3D "rmii"; ethernet =3D <&fec1>; @@ -138,27 +138,27 @@ fixed-link { }; }; =20 - port@1 { + ethernet-port@1 { reg =3D <1>; label =3D "eth_cu_100_3"; }; =20 - port@5 { + ethernet-port@5 { reg =3D <5>; label =3D "eth_cu_1000_4"; }; =20 - port@6 { + ethernet-port@6 { reg =3D <6>; label =3D "eth_cu_1000_5"; }; =20 - port@8 { + ethernet-port@8 { reg =3D <8>; label =3D "eth_cu_1000_1"; }; =20 - port@9 { + ethernet-port@9 { reg =3D <9>; label =3D "eth_cu_1000_2"; phy-handle =3D <&phy9>; @@ -167,12 +167,12 @@ port@9 { }; }; =20 - mdio1 { + mdio-external { compatible =3D "marvell,mv88e6xxx-mdio-external"; #address-cells =3D <1>; #size-cells =3D <0>; =20 - phy9: phy9@0 { + phy9: ethernet-phy@0 { compatible =3D "ethernet-phy-ieee802.3-c45"; pinctrl-0 =3D <&pinctrl_gpio_phy9>; pinctrl-names =3D "default"; diff --git a/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-spu3.dts b/arch/arm/bo= ot/dts/nxp/vf/vf610-zii-ssmb-spu3.dts index f5ae0d5de315..22c8f44390a9 100644 --- a/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-spu3.dts +++ b/arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-spu3.dts @@ -137,7 +137,7 @@ mdio1: mdio { suppress-preamble; status =3D "okay"; =20 - switch0: switch0@0 { + switch0: ethernet-switch@0 { compatible =3D "marvell,mv88e6190"; pinctrl-0 =3D <&pinctrl_gpio_switch0>; pinctrl-names =3D "default"; @@ -148,11 +148,11 @@ switch0: switch0@0 { interrupt-controller; #interrupt-cells =3D <2>; =20 - ports { + ethernet-ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 - port@0 { + ethernet-port@0 { reg =3D <0>; phy-mode =3D "rmii"; ethernet =3D <&fec1>; @@ -163,32 +163,32 @@ fixed-link { }; }; =20 - port@1 { + ethernet-port@1 { reg =3D <1>; label =3D "eth_cu_1000_1"; }; =20 - port@2 { + ethernet-port@2 { reg =3D <2>; label =3D "eth_cu_1000_2"; }; =20 - port@3 { + ethernet-port@3 { reg =3D <3>; label =3D "eth_cu_1000_3"; }; =20 - port@4 { + ethernet-port@4 { reg =3D <4>; label =3D "eth_cu_1000_4"; }; =20 - port@5 { + ethernet-port@5 { reg =3D <5>; label =3D "eth_cu_1000_5"; }; =20 - port@6 { + ethernet-port@6 { reg =3D <6>; label =3D "eth_cu_1000_6"; }; --=20 2.34.1 From nobody Tue Dec 30 17:01:00 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 59918C4332F for ; Mon, 13 Nov 2023 23:36:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232119AbjKMXg3 (ORCPT ); Mon, 13 Nov 2023 18:36:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231945AbjKMXgP (ORCPT ); Mon, 13 Nov 2023 18:36:15 -0500 Received: from mail-lj1-x22f.google.com (mail-lj1-x22f.google.com [IPv6:2a00:1450:4864:20::22f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31214D6F for ; Mon, 13 Nov 2023 15:36:05 -0800 (PST) Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2c503dbe50dso69712591fa.1 for ; Mon, 13 Nov 2023 15:36:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699918563; x=1700523363; 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=CmeI3rI1EdZ3yymalOF2Lv3t7TF652sPTV2+WklP064=; b=iRBViyIGO646HAQuvzrQK0bsZ0lm7zMjudAPOHELMbImj9t1neO/XVmoMWwYuAbo7D 8uMd81JqdsQzfv3D3tVbB5FyVHLg61gVqQ2FTHYHISa6IwEGjKpY6L2amzQWA2fceVSR rIXS7d1NiHSbft4t4aJcrIaNvlamMmVkfqTCKGZO9QbpnCv/6wNUhqdXvGGqP8iaJS9Z TujVv5Rih2fEWEuiRcU/mtY5QJ/VQ8Zlg2rsi1oJAuR7kr5gnzVyWITGt3iGtBn5cZd8 VO5jCF3BBH5A2NJHC3mRY9pSSQa5brmNx/31Xc4RtaBUNWnRjLkI6qXWpLzyhGl6k/wm zB7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699918563; x=1700523363; 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=CmeI3rI1EdZ3yymalOF2Lv3t7TF652sPTV2+WklP064=; b=gJsbdWAIc8OESfHzD+5g+Y+bAVLxXBtBlvAbZHcjzTGIQHu0VUdwBWk7r/bhOeDqgR RmnrRsaLpYBoF+0pKcqisv5HyHmfDH5+0QSm66LtJV4sGAC5/CPrFFc9LO6Jd0LkXbtS c2HjGy6ZHELye/L2vgXvfAnfheUppALDePHRNmY2E0fs+OGmN1lQroUmdeS5ffoi/94D jNrEPCgvSiNxm37Jkfcc6JtxhFeCRSHfp3YeR3g9FvYQvN7ZhhjRaZwBAnDWgDdsF1Qk KAJSSbld4AANgM+vMhBn2wDIbqFz63VgIpHOqYtOKgHhf35WjoSwyle33+QpxoEMJRnJ La/A== X-Gm-Message-State: AOJu0Yx5W6SaYtiWgOowGGoorxOfg/14IvEnVoUW2TVHYLizomqfBgsz EFi9EHku8eh313uGSgM/r9l7cA== X-Google-Smtp-Source: AGHT+IEZS4TOYlETVCIWg9lTsb7AozoivIqWDpGhsoNRfe/WjEV3u9PhfS2Cg0B6lwbia/Z/GoJ3Xw== X-Received: by 2002:a2e:1451:0:b0:2c5:4a5:9560 with SMTP id 17-20020a2e1451000000b002c504a59560mr502158lju.41.1699918563431; Mon, 13 Nov 2023 15:36:03 -0800 (PST) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 17-20020a2e0611000000b002b70a8478ddsm1202859ljg.44.2023.11.13.15.36.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 15:36:02 -0800 (PST) From: Linus Walleij Date: Tue, 14 Nov 2023 00:36:00 +0100 Subject: [PATCH net-next v8 5/9] ARM64: dts: marvell: Fix some common switch mistakes MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231114-marvell-88e6152-wan-led-v8-5-50688741691b@linaro.org> References: <20231114-marvell-88e6152-wan-led-v8-0-50688741691b@linaro.org> In-Reply-To: <20231114-marvell-88e6152-wan-led-v8-0-50688741691b@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 , Florian Fainelli X-Mailer: b4 0.12.4 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix some errors in the Marvell MV88E6xxx switch descriptions: - The top node had no address size or cells. - switch0@0 is not OK, should be ethernet-switch@0. - ports should be ethernet-ports - port@0 should be ethernet-port@0 - PHYs should be named ethernet-phy@ Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli Signed-off-by: Linus Walleij --- .../dts/marvell/armada-3720-espressobin-ultra.dts | 14 ++-- .../boot/dts/marvell/armada-3720-espressobin.dtsi | 20 +++-- .../boot/dts/marvell/armada-3720-gl-mv1000.dts | 20 +++-- .../boot/dts/marvell/armada-3720-turris-mox.dts | 85 ++++++++++++------= ---- .../boot/dts/marvell/armada-7040-mochabin.dts | 24 +++--- .../dts/marvell/armada-8040-clearfog-gt-8k.dts | 22 +++--- arch/arm64/boot/dts/marvell/cn9130-crb.dtsi | 42 +++++------ 7 files changed, 115 insertions(+), 112 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts = b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts index f9abef8dcc94..870bb380a40a 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts @@ -126,32 +126,32 @@ &switch0 { =20 reset-gpios =3D <&gpiosb 23 GPIO_ACTIVE_LOW>; =20 - ports { - switch0port1: port@1 { + ethernet-ports { + switch0port1: ethernet-port@1 { reg =3D <1>; label =3D "lan0"; phy-handle =3D <&switch0phy0>; }; =20 - switch0port2: port@2 { + switch0port2: ethernet-port@2 { reg =3D <2>; label =3D "lan1"; phy-handle =3D <&switch0phy1>; }; =20 - switch0port3: port@3 { + switch0port3: ethernet-port@3 { reg =3D <3>; label =3D "lan2"; phy-handle =3D <&switch0phy2>; }; =20 - switch0port4: port@4 { + switch0port4: ethernet-port@4 { reg =3D <4>; label =3D "lan3"; phy-handle =3D <&switch0phy3>; }; =20 - switch0port5: port@5 { + switch0port5: ethernet-port@5 { reg =3D <5>; label =3D "wan"; phy-handle =3D <&extphy>; @@ -160,7 +160,7 @@ switch0port5: port@5 { }; =20 mdio { - switch0phy3: switch0phy3@14 { + switch0phy3: ethernet-phy@14 { reg =3D <0x14>; }; }; diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi b/arc= h/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi index 5fc613d24151..86ec0df1c676 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi @@ -145,19 +145,17 @@ &usb2 { }; =20 &mdio { - switch0: switch0@1 { + switch0: ethernet-switch@1 { compatible =3D "marvell,mv88e6085"; - #address-cells =3D <1>; - #size-cells =3D <0>; reg =3D <1>; =20 dsa,member =3D <0 0>; =20 - ports { + ethernet-ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch0port0: port@0 { + switch0port0: ethernet-port@0 { reg =3D <0>; label =3D "cpu"; ethernet =3D <ð0>; @@ -168,19 +166,19 @@ fixed-link { }; }; =20 - switch0port1: port@1 { + switch0port1: ethernet-port@1 { reg =3D <1>; label =3D "wan"; phy-handle =3D <&switch0phy0>; }; =20 - switch0port2: port@2 { + switch0port2: ethernet-port@2 { reg =3D <2>; label =3D "lan0"; phy-handle =3D <&switch0phy1>; }; =20 - switch0port3: port@3 { + switch0port3: ethernet-port@3 { reg =3D <3>; label =3D "lan1"; phy-handle =3D <&switch0phy2>; @@ -192,13 +190,13 @@ mdio { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch0phy0: switch0phy0@11 { + switch0phy0: ethernet-phy@11 { reg =3D <0x11>; }; - switch0phy1: switch0phy1@12 { + switch0phy1: ethernet-phy@12 { reg =3D <0x12>; }; - switch0phy2: switch0phy2@13 { + switch0phy2: ethernet-phy@13 { reg =3D <0x13>; }; }; diff --git a/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts b/arch/a= rm64/boot/dts/marvell/armada-3720-gl-mv1000.dts index b1b45b4fa9d4..63fbc8352161 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts @@ -152,31 +152,29 @@ &uart0 { }; =20 &mdio { - switch0: switch0@1 { + switch0: ethernet-switch@1 { compatible =3D "marvell,mv88e6085"; - #address-cells =3D <1>; - #size-cells =3D <0>; reg =3D <1>; =20 dsa,member =3D <0 0>; =20 - ports: ports { + ports: ethernet-ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 - port@0 { + ethernet-port@0 { reg =3D <0>; label =3D "cpu"; ethernet =3D <ð0>; }; =20 - port@1 { + ethernet-port@1 { reg =3D <1>; label =3D "wan"; phy-handle =3D <&switch0phy0>; }; =20 - port@2 { + ethernet-port@2 { reg =3D <2>; label =3D "lan0"; phy-handle =3D <&switch0phy1>; @@ -185,7 +183,7 @@ port@2 { nvmem-cell-names =3D "mac-address"; }; =20 - port@3 { + ethernet-port@3 { reg =3D <3>; label =3D "lan1"; phy-handle =3D <&switch0phy2>; @@ -199,13 +197,13 @@ mdio { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch0phy0: switch0phy0@11 { + switch0phy0: ethernet-phy@11 { reg =3D <0x11>; }; - switch0phy1: switch0phy1@12 { + switch0phy1: ethernet-phy@12 { reg =3D <0x12>; }; - switch0phy2: switch0phy2@13 { + switch0phy2: ethernet-phy@13 { reg =3D <0x13>; }; }; diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/= arm64/boot/dts/marvell/armada-3720-turris-mox.dts index 9eab2bb22134..66cd98b67744 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts @@ -304,7 +304,13 @@ phy1: ethernet-phy@1 { reg =3D <1>; }; =20 - /* switch nodes are enabled by U-Boot if modules are present */ + /* + * NOTE: switch nodes are enabled by U-Boot if modules are present + * DO NOT change this node name (switch0@10) even if it is not following + * conventions! Deployed U-Boot binaries are explicitly looking for + * this node in order to augment the device tree! + * Also do not touch the "ports" or "port@n" nodes. These are also ABI. + */ switch0@10 { compatible =3D "marvell,mv88e6190"; reg =3D <0x10>; @@ -317,35 +323,35 @@ mdio { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch0phy1: switch0phy1@1 { + switch0phy1: ethernet-phy@1 { reg =3D <0x1>; }; =20 - switch0phy2: switch0phy2@2 { + switch0phy2: ethernet-phy@2 { reg =3D <0x2>; }; =20 - switch0phy3: switch0phy3@3 { + switch0phy3: ethernet-phy@3 { reg =3D <0x3>; }; =20 - switch0phy4: switch0phy4@4 { + switch0phy4: ethernet-phy@4 { reg =3D <0x4>; }; =20 - switch0phy5: switch0phy5@5 { + switch0phy5: ethernet-phy@5 { reg =3D <0x5>; }; =20 - switch0phy6: switch0phy6@6 { + switch0phy6: ethernet-phy@6 { reg =3D <0x6>; }; =20 - switch0phy7: switch0phy7@7 { + switch0phy7: ethernet-phy@7 { reg =3D <0x7>; }; =20 - switch0phy8: switch0phy8@8 { + switch0phy8: ethernet-phy@8 { reg =3D <0x8>; }; }; @@ -430,6 +436,7 @@ port-sfp@a { }; }; =20 + /* NOTE: this node name is ABI, don't change it! */ switch0@2 { compatible =3D "marvell,mv88e6085"; reg =3D <0x2>; @@ -442,19 +449,19 @@ mdio { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch0phy1_topaz: switch0phy1@11 { + switch0phy1_topaz: ethernet-phy@11 { reg =3D <0x11>; }; =20 - switch0phy2_topaz: switch0phy2@12 { + switch0phy2_topaz: ethernet-phy@12 { reg =3D <0x12>; }; =20 - switch0phy3_topaz: switch0phy3@13 { + switch0phy3_topaz: ethernet-phy@13 { reg =3D <0x13>; }; =20 - switch0phy4_topaz: switch0phy4@14 { + switch0phy4_topaz: ethernet-phy@14 { reg =3D <0x14>; }; }; @@ -497,6 +504,7 @@ port@5 { }; }; =20 + /* NOTE: this node name is ABI, don't change it! */ switch1@11 { compatible =3D "marvell,mv88e6190"; reg =3D <0x11>; @@ -509,35 +517,35 @@ mdio { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch1phy1: switch1phy1@1 { + switch1phy1: ethernet-phy@1 { reg =3D <0x1>; }; =20 - switch1phy2: switch1phy2@2 { + switch1phy2: ethernet-phy@2 { reg =3D <0x2>; }; =20 - switch1phy3: switch1phy3@3 { + switch1phy3: ethernet-phy@3 { reg =3D <0x3>; }; =20 - switch1phy4: switch1phy4@4 { + switch1phy4: ethernet-phy@4 { reg =3D <0x4>; }; =20 - switch1phy5: switch1phy5@5 { + switch1phy5: ethernet-phy@5 { reg =3D <0x5>; }; =20 - switch1phy6: switch1phy6@6 { + switch1phy6: ethernet-phy@6 { reg =3D <0x6>; }; =20 - switch1phy7: switch1phy7@7 { + switch1phy7: ethernet-phy@7 { reg =3D <0x7>; }; =20 - switch1phy8: switch1phy8@8 { + switch1phy8: ethernet-phy@8 { reg =3D <0x8>; }; }; @@ -622,6 +630,7 @@ port-sfp@a { }; }; =20 + /* NOTE: this node name is ABI, don't change it! */ switch1@2 { compatible =3D "marvell,mv88e6085"; reg =3D <0x2>; @@ -634,19 +643,19 @@ mdio { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch1phy1_topaz: switch1phy1@11 { + switch1phy1_topaz: ethernet-phy@11 { reg =3D <0x11>; }; =20 - switch1phy2_topaz: switch1phy2@12 { + switch1phy2_topaz: ethernet-phy@12 { reg =3D <0x12>; }; =20 - switch1phy3_topaz: switch1phy3@13 { + switch1phy3_topaz: ethernet-phy@13 { reg =3D <0x13>; }; =20 - switch1phy4_topaz: switch1phy4@14 { + switch1phy4_topaz: ethernet-phy@14 { reg =3D <0x14>; }; }; @@ -689,6 +698,7 @@ port@5 { }; }; =20 + /* NOTE: this node name is ABI, don't change it! */ switch2@12 { compatible =3D "marvell,mv88e6190"; reg =3D <0x12>; @@ -701,35 +711,35 @@ mdio { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch2phy1: switch2phy1@1 { + switch2phy1: ethernet-phy@1 { reg =3D <0x1>; }; =20 - switch2phy2: switch2phy2@2 { + switch2phy2: ethernet-phy@2 { reg =3D <0x2>; }; =20 - switch2phy3: switch2phy3@3 { + switch2phy3: ethernet-phy@3 { reg =3D <0x3>; }; =20 - switch2phy4: switch2phy4@4 { + switch2phy4: ethernet-phy@4 { reg =3D <0x4>; }; =20 - switch2phy5: switch2phy5@5 { + switch2phy5: ethernet-phy@5 { reg =3D <0x5>; }; =20 - switch2phy6: switch2phy6@6 { + switch2phy6: ethernet-phy@6 { reg =3D <0x6>; }; =20 - switch2phy7: switch2phy7@7 { + switch2phy7: ethernet-phy@7 { reg =3D <0x7>; }; =20 - switch2phy8: switch2phy8@8 { + switch2phy8: ethernet-phy@8 { reg =3D <0x8>; }; }; @@ -805,6 +815,7 @@ port-sfp@a { }; }; =20 + /* NOTE: this node name is ABI, don't change it! */ switch2@2 { compatible =3D "marvell,mv88e6085"; reg =3D <0x2>; @@ -817,19 +828,19 @@ mdio { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch2phy1_topaz: switch2phy1@11 { + switch2phy1_topaz: ethernet-phy@11 { reg =3D <0x11>; }; =20 - switch2phy2_topaz: switch2phy2@12 { + switch2phy2_topaz: ethernet-phy@12 { reg =3D <0x12>; }; =20 - switch2phy3_topaz: switch2phy3@13 { + switch2phy3_topaz: ethernet-phy@13 { reg =3D <0x13>; }; =20 - switch2phy4_topaz: switch2phy4@14 { + switch2phy4_topaz: ethernet-phy@14 { reg =3D <0x14>; }; }; diff --git a/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts b/arch/ar= m64/boot/dts/marvell/armada-7040-mochabin.dts index 48202810bf78..40b7ee7ead72 100644 --- a/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts +++ b/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts @@ -301,10 +301,8 @@ eth2phy: ethernet-phy@1 { }; =20 /* 88E6141 Topaz switch */ - switch: switch@3 { + switch: ethernet-switch@3 { compatible =3D "marvell,mv88e6085"; - #address-cells =3D <1>; - #size-cells =3D <0>; reg =3D <3>; =20 pinctrl-names =3D "default"; @@ -314,35 +312,35 @@ switch: switch@3 { interrupt-parent =3D <&cp0_gpio1>; interrupts =3D <1 IRQ_TYPE_LEVEL_LOW>; =20 - ports { + ethernet-ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 - swport1: port@1 { + swport1: ethernet-port@1 { reg =3D <1>; label =3D "lan0"; phy-handle =3D <&swphy1>; }; =20 - swport2: port@2 { + swport2: ethernet-port@2 { reg =3D <2>; label =3D "lan1"; phy-handle =3D <&swphy2>; }; =20 - swport3: port@3 { + swport3: ethernet-port@3 { reg =3D <3>; label =3D "lan2"; phy-handle =3D <&swphy3>; }; =20 - swport4: port@4 { + swport4: ethernet-port@4 { reg =3D <4>; label =3D "lan3"; phy-handle =3D <&swphy4>; }; =20 - port@5 { + ethernet-port@5 { reg =3D <5>; label =3D "cpu"; ethernet =3D <&cp0_eth1>; @@ -355,19 +353,19 @@ mdio { #address-cells =3D <1>; #size-cells =3D <0>; =20 - swphy1: swphy1@17 { + swphy1: ethernet-phy@17 { reg =3D <17>; }; =20 - swphy2: swphy2@18 { + swphy2: ethernet-phy@18 { reg =3D <18>; }; =20 - swphy3: swphy3@19 { + swphy3: ethernet-phy@19 { reg =3D <19>; }; =20 - swphy4: swphy4@20 { + swphy4: ethernet-phy@20 { reg =3D <20>; }; }; diff --git a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts b/a= rch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts index 4125202028c8..67892f0d2863 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts +++ b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts @@ -497,42 +497,42 @@ ge_phy: ethernet-phy@0 { reset-deassert-us =3D <10000>; }; =20 - switch0: switch0@4 { + switch0: ethernet-switch@4 { compatible =3D "marvell,mv88e6085"; reg =3D <4>; pinctrl-names =3D "default"; pinctrl-0 =3D <&cp1_switch_reset_pins>; reset-gpios =3D <&cp1_gpio1 24 GPIO_ACTIVE_LOW>; =20 - ports { + ethernet-ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 - port@1 { + ethernet-port@1 { reg =3D <1>; label =3D "lan2"; phy-handle =3D <&switch0phy0>; }; =20 - port@2 { + ethernet-port@2 { reg =3D <2>; label =3D "lan1"; phy-handle =3D <&switch0phy1>; }; =20 - port@3 { + ethernet-port@3 { reg =3D <3>; label =3D "lan4"; phy-handle =3D <&switch0phy2>; }; =20 - port@4 { + ethernet-port@4 { reg =3D <4>; label =3D "lan3"; phy-handle =3D <&switch0phy3>; }; =20 - port@5 { + ethernet-port@5 { reg =3D <5>; label =3D "cpu"; ethernet =3D <&cp1_eth2>; @@ -545,19 +545,19 @@ mdio { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch0phy0: switch0phy0@11 { + switch0phy0: ethernet-phy@11 { reg =3D <0x11>; }; =20 - switch0phy1: switch0phy1@12 { + switch0phy1: ethernet-phy@12 { reg =3D <0x12>; }; =20 - switch0phy2: switch0phy2@13 { + switch0phy2: ethernet-phy@13 { reg =3D <0x13>; }; =20 - switch0phy3: switch0phy3@14 { + switch0phy3: ethernet-phy@14 { reg =3D <0x14>; }; }; diff --git a/arch/arm64/boot/dts/marvell/cn9130-crb.dtsi b/arch/arm64/boot/= dts/marvell/cn9130-crb.dtsi index 32cfb3e2efc3..7538ed56053b 100644 --- a/arch/arm64/boot/dts/marvell/cn9130-crb.dtsi +++ b/arch/arm64/boot/dts/marvell/cn9130-crb.dtsi @@ -207,11 +207,9 @@ phy0: ethernet-phy@0 { reg =3D <0>; }; =20 - switch6: switch0@6 { + switch6: ethernet-switch@6 { /* Actual device is MV88E6393X */ compatible =3D "marvell,mv88e6190"; - #address-cells =3D <1>; - #size-cells =3D <0>; reg =3D <6>; interrupt-parent =3D <&cp0_gpio1>; interrupts =3D <28 IRQ_TYPE_LEVEL_LOW>; @@ -220,59 +218,59 @@ switch6: switch0@6 { =20 dsa,member =3D <0 0>; =20 - ports { + ethernet-ports { #address-cells =3D <1>; #size-cells =3D <0>; =20 - port@1 { + ethernet-port@1 { reg =3D <1>; label =3D "p1"; phy-handle =3D <&switch0phy1>; }; =20 - port@2 { + ethernet-port@2 { reg =3D <2>; label =3D "p2"; phy-handle =3D <&switch0phy2>; }; =20 - port@3 { + ethernet-port@3 { reg =3D <3>; label =3D "p3"; phy-handle =3D <&switch0phy3>; }; =20 - port@4 { + ethernet-port@4 { reg =3D <4>; label =3D "p4"; phy-handle =3D <&switch0phy4>; }; =20 - port@5 { + ethernet-port@5 { reg =3D <5>; label =3D "p5"; phy-handle =3D <&switch0phy5>; }; =20 - port@6 { + ethernet-port@6 { reg =3D <6>; label =3D "p6"; phy-handle =3D <&switch0phy6>; }; =20 - port@7 { + ethernet-port@7 { reg =3D <7>; label =3D "p7"; phy-handle =3D <&switch0phy7>; }; =20 - port@8 { + ethernet-port@8 { reg =3D <8>; label =3D "p8"; phy-handle =3D <&switch0phy8>; }; =20 - port@9 { + ethernet-port@9 { reg =3D <9>; label =3D "p9"; phy-mode =3D "10gbase-r"; @@ -280,7 +278,7 @@ port@9 { managed =3D "in-band-status"; }; =20 - port@a { + ethernet-port@a { reg =3D <10>; ethernet =3D <&cp0_eth0>; phy-mode =3D "10gbase-r"; @@ -293,35 +291,35 @@ mdio { #address-cells =3D <1>; #size-cells =3D <0>; =20 - switch0phy1: switch0phy1@1 { + switch0phy1: ethernet-phy@1 { reg =3D <0x1>; }; =20 - switch0phy2: switch0phy2@2 { + switch0phy2: ethernet-phy@2 { reg =3D <0x2>; }; =20 - switch0phy3: switch0phy3@3 { + switch0phy3: ethernet-phy@3 { reg =3D <0x3>; }; =20 - switch0phy4: switch0phy4@4 { + switch0phy4: ethernet-phy@4 { reg =3D <0x4>; }; =20 - switch0phy5: switch0phy5@5 { + switch0phy5: ethernet-phy@5 { reg =3D <0x5>; }; =20 - switch0phy6: switch0phy6@6 { + switch0phy6: ethernet-phy@6 { reg =3D <0x6>; }; =20 - switch0phy7: switch0phy7@7 { + switch0phy7: ethernet-phy@7 { reg =3D <0x7>; }; =20 - switch0phy8: switch0phy8@8 { + switch0phy8: ethernet-phy@8 { reg =3D <0x8>; }; }; --=20 2.34.1 From nobody Tue Dec 30 17:01:00 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 93656C4167B for ; Mon, 13 Nov 2023 23:36:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231953AbjKMXgW (ORCPT ); Mon, 13 Nov 2023 18:36:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231920AbjKMXgJ (ORCPT ); Mon, 13 Nov 2023 18:36:09 -0500 Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F61310E0 for ; Mon, 13 Nov 2023 15:36:06 -0800 (PST) Received: by mail-lj1-x22c.google.com with SMTP id 38308e7fff4ca-2c83ffcdbe3so25253621fa.1 for ; Mon, 13 Nov 2023 15:36:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699918564; x=1700523364; 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=N7sBbrB5dazvmxdFbFWIm12yMxEolhEuwzB459S9svI=; b=GCYath4zyDrnwOJWVtITfzen6Cj9ndDAB2wpCz5yC2xJOvoIZmqQk6tfjPcKHKzIQX 47rXe699q6IgYQatad0qpMeMa482pPA+cOvTH5HFU26TvYy6i+pkGh7Z4q+fsajhaDUC AdZvCAjiBSlg3dHBwVwTw7/xwRZ6evsSdHEtPL+PDEIleTaJXhGHZjh1mUah46fdAYQ1 bbSrTHcCzykX/FPbMkmhFsadn4LlEWZyPB9sl34KXWBx6XiM6cO/H9HDycNyEM5J++Xw J3AAMkeohFvs+wYRT10v0Tqfw55dOHX4tqvMY9MXgjLzqdHRvgU203ibprg5npJ9P/gX yjpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699918564; x=1700523364; 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=N7sBbrB5dazvmxdFbFWIm12yMxEolhEuwzB459S9svI=; b=Q+dZupa9so2l7eWb6IbDbpPvqHrY6zk1AOqQIYhiQlZliRxsxakpeTQK2tKqopOirw 1Gdyw3K3FZB9ilKOADXEl8iHKdXhnimhvBt2Itn+wURngdswe5FH89yXcKRrez/CzrMe k116mDcGqpuaL7yR9324u/x6nYBmNwn+FJSF6YyTFfwtFMsgcXqCgYFDjAOt0VH0vPyA jI9CoTWdYEGHmOAcCuopvK0GFWye6BqpHtfcBp2ApLbOCnPsvXo4F1+ok+vhDI4cA3Z0 zI2N80Fk53nKwaj2yZpwAMbjkOgm64YUeQ1RdwCLle5KZmnMLVQK8s9F9vSKyckjw/ke rP8A== X-Gm-Message-State: AOJu0YxJESvJ/ZPx6mCXYZOfObpAG3rmwiNIPdAsvFnSY7NeXpyYOyC1 e0Cs9azeUzIlN2LPWa0phw3H3g== X-Google-Smtp-Source: AGHT+IEcKzuTyUsnCCKx0aDIJeN7M8fqCWuHVFSv5zu+wJ/DA8g7pht0vHxLMNEUkq/nMkCaBzn1tQ== X-Received: by 2002:a05:651c:1055:b0:2c5:3139:2d04 with SMTP id x21-20020a05651c105500b002c531392d04mr451059ljm.47.1699918564602; Mon, 13 Nov 2023 15:36:04 -0800 (PST) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 17-20020a2e0611000000b002b70a8478ddsm1202859ljg.44.2023.11.13.15.36.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 15:36:04 -0800 (PST) From: Linus Walleij Date: Tue, 14 Nov 2023 00:36:01 +0100 Subject: [PATCH net-next v8 6/9] 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: <20231114-marvell-88e6152-wan-led-v8-6-50688741691b@linaro.org> References: <20231114-marvell-88e6152-wan-led-v8-0-50688741691b@linaro.org> In-Reply-To: <20231114-marvell-88e6152-wan-led-v8-0-50688741691b@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 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. Signed-off-by: Linus Walleij Reviewed-by: Andrew Lunn Reviewed-by: Rob Herring --- .../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 From nobody Tue Dec 30 17:01:00 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 A2CD1C41535 for ; Mon, 13 Nov 2023 23:36:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232031AbjKMXgd (ORCPT ); Mon, 13 Nov 2023 18:36:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231924AbjKMXgR (ORCPT ); Mon, 13 Nov 2023 18:36:17 -0500 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3A0210EC for ; Mon, 13 Nov 2023 15:36:07 -0800 (PST) Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2c6cb4a79deso54774851fa.1 for ; Mon, 13 Nov 2023 15:36:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699918566; x=1700523366; 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=Wc+Wq7sqd6cor2r5WAdGrmvNaWx96k7C6JDLjLbdJqE=; b=C8bdZCJcexlqB4ZQ5RjViELydZYyJRb0q5C2ONuZ7Vn/22FGgI4cHZNDzhYGCozT1i MgYXsoPl01vdXeN1xyZmEzXa6EIIwbCZTgyViY9Bb/yB7fCXnP6TAvZsKdyvI9TvxYH3 wJWaxZvDeylVRcvCQBesFrIv7EOMh0C7/GhDquMxM+Bi4tNe/525IHiIbN4McC8rX13b m1AKhFZg6ku+5tKGQReTfvpscasQVR4hyMBIcBle1RNqN90HXjwBdZ6xOzy++4zt/H1W RXnGpuvqspKV6YqRCKSKJHv0ndEkVT2UQNb5Ha1ffmYj3/BSESJIiJV3iILQVqO/l/vO hRFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699918566; x=1700523366; 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=Wc+Wq7sqd6cor2r5WAdGrmvNaWx96k7C6JDLjLbdJqE=; b=o6rJbPkOUaZrBI5zd/o75Z9zgv7Jr8aceyPIqynparfxuVZsNSz36Toi9yGFumMifP 7QIxwJBPh+HytybTiCzPsR2AP2PziUp96OpOmgyHJ5qEgoiDd1Oa/6WJTSjxbMS7WRex TNrXGttlwISIo6rkYLw1umVjccgGtlIDpVMDDfRGscTa5wTcN+77FAguNeEOSQZvhDrW xqOwbEknW0uYzfAae1WqTpXEIN6jCvvShqzU9GEwaLsEAKLPy0vXrWkTPtwV17R1WFV1 eoaCeC1DRXN0Sk6008yIpFJyDsC0IJXy7eNixBBzkdUGSPr9Cks2U6cNUPQtCiinVYna 9Zfg== X-Gm-Message-State: AOJu0YzNwGl9y81G+5hzaNNHnJiK/3OmRmuoMrJwY/9KHXnpj1OR9R0I Zn1AyeUs7AJis8riZETAKpfyLw== X-Google-Smtp-Source: AGHT+IG4Cj5m1hC6xB7TsQYZze+Ywj04f7LA/6FAjfEo+HYtHB1lh+d3McvkWwQMVejVkOZu0H07IQ== X-Received: by 2002:a2e:9042:0:b0:2c3:c4b8:19ec with SMTP id n2-20020a2e9042000000b002c3c4b819ecmr192115ljg.18.1699918565731; Mon, 13 Nov 2023 15:36:05 -0800 (PST) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 17-20020a2e0611000000b002b70a8478ddsm1202859ljg.44.2023.11.13.15.36.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 15:36:05 -0800 (PST) From: Linus Walleij Date: Tue, 14 Nov 2023 00:36:02 +0100 Subject: [PATCH net-next v8 7/9] dt-bindings: marvell: Rewrite MV88E6xxx in schema MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231114-marvell-88e6152-wan-led-v8-7-50688741691b@linaro.org> References: <20231114-marvell-88e6152-wan-led-v8-0-50688741691b@linaro.org> In-Reply-To: <20231114-marvell-88e6152-wan-led-v8-0-50688741691b@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 , Florian Fainelli X-Mailer: b4 0.12.4 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is an attempt to rewrite the Marvell MV88E6xxx switch bindings in YAML schema. The current text binding says: WARNING: This binding is currently unstable. Do not program it into a FLASH never to be changed again. Once this binding is stable, this warning will be removed. Well that never happened before we switched to YAML markup, we can't have it like this, what about fixing the mess? Reviewed-by: Andrew Lunn Reviewed-by: Rob Herring Reviewed-by: Florian Fainelli Signed-off-by: Linus Walleij --- .../bindings/net/dsa/marvell,mv88e6xxx.yaml | 337 +++++++++++++++++= ++++ .../devicetree/bindings/net/dsa/marvell.txt | 109 ------- MAINTAINERS | 2 +- 3 files changed, 338 insertions(+), 110 deletions(-) diff --git a/Documentation/devicetree/bindings/net/dsa/marvell,mv88e6xxx.ya= ml b/Documentation/devicetree/bindings/net/dsa/marvell,mv88e6xxx.yaml new file mode 100644 index 000000000000..19f15bdd1c97 --- /dev/null +++ b/Documentation/devicetree/bindings/net/dsa/marvell,mv88e6xxx.yaml @@ -0,0 +1,337 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/dsa/marvell,mv88e6xxx.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Marvell MV88E6xxx DSA switch family + +maintainers: + - Andrew Lunn + +description: + The Marvell MV88E6xxx switch series has been produced and sold + by Marvell since at least 2008. The switch has a few compatibles which + just indicate the base address of the switch, then operating systems + can investigate switch ID registers to find out which actual version + of the switch it is dealing with. + +properties: + compatible: + oneOf: + - enum: + - marvell,mv88e6085 + - marvell,mv88e6190 + - marvell,mv88e6250 + description: | + marvell,mv88e6085: This switch uses base address 0x10. + This switch and its siblings will be autodetected from + ID registers found in the switch, so only "marvell,mv88e6085" = should be + specified. This includes the following list of MV88Exxxx switc= hes: + 6085, 6095, 6097, 6123, 6131, 6141, 6161, 6165, 6171, 6172, 61= 75, 6176, + 6185, 6240, 6320, 6321, 6341, 6350, 6351, 6352 + marvell,mv88e6190: This switch uses base address 0x00. + This switch and its siblings will be autodetected from + ID registers found in the switch, so only "marvell,mv88e6190" = should be + specified. This includes the following list of MV88Exxxx switc= hes: + 6190, 6190X, 6191, 6290, 6361, 6390, 6390X + marvell,mv88e6250: This switch uses base address 0x08 or 0x18. + This switch and its siblings will be autodetected from + ID registers found in the switch, so only "marvell,mv88e6250" = should be + specified. This includes the following list of MV88Exxxx switc= hes: + 6220, 6250 + - items: + - const: marvell,turris-mox-mv88e6085 + - const: marvell,mv88e6085 + - items: + - const: marvell,turris-mox-mv88e6190 + - const: marvell,mv88e6190 + + reg: + maxItems: 1 + + eeprom-length: + $ref: /schemas/types.yaml#/definitions/uint32 + description: Set to the length of an EEPROM connected to the switch. M= ust be + set if the switch can not detect the presence and/or size of a conne= cted + EEPROM, otherwise optional. + + reset-gpios: + description: + GPIO to be used to reset the whole device + maxItems: 1 + + interrupts: + description: The switch provides an external interrupt line, but it is + not always used by target systems. + maxItems: 1 + + interrupt-controller: + description: The switch has an internal interrupt controller used by + the different sub-blocks. + + '#interrupt-cells': + description: The internal interrupt controller only supports triggering + on active high level interrupts so the second cell must alway be set= to + IRQ_TYPE_LEVEL_HIGH. + const: 2 + + mdio: + $ref: /schemas/net/mdio.yaml# + unevaluatedProperties: false + description: Marvell MV88E6xxx switches have an varying combination of + internal and external MDIO buses, in some cases a combined bus that + can be used both internally and externally. This node is for the + primary bus, used internally and sometimes also externally. + + mdio-external: + $ref: /schemas/net/mdio.yaml# + unevaluatedProperties: false + description: Marvell MV88E6xxx switches that have a separate external + MDIO bus use this port to access external components on the MDIO bus. + + properties: + compatible: + const: marvell,mv88e6xxx-mdio-external + + required: + - compatible + +allOf: + - $ref: dsa.yaml#/$defs/ethernet-ports + +required: + - compatible + - reg + +unevaluatedProperties: false + +examples: + - | + #include + mdio { + #address-cells =3D <1>; + #size-cells =3D <0>; + + ethernet-switch@0 { + compatible =3D "marvell,mv88e6085"; + reg =3D <0>; + reset-gpios =3D <&gpio5 1 GPIO_ACTIVE_LOW>; + + mdio { + #address-cells =3D <1>; + #size-cells =3D <0>; + + sw_phy0: ethernet-phy@0 { + reg =3D <0x0>; + }; + + sw_phy1: ethernet-phy@1 { + reg =3D <0x1>; + }; + + sw_phy2: ethernet-phy@2 { + reg =3D <0x2>; + }; + + sw_phy3: ethernet-phy@3 { + reg =3D <0x3>; + }; + }; + + ethernet-ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + ethernet-port@0 { + reg =3D <0>; + label =3D "lan4"; + phy-handle =3D <&sw_phy0>; + phy-mode =3D "internal"; + }; + + ethernet-port@1 { + reg =3D <1>; + label =3D "lan3"; + phy-handle =3D <&sw_phy1>; + phy-mode =3D "internal"; + }; + + ethernet-port@2 { + reg =3D <2>; + label =3D "lan2"; + phy-handle =3D <&sw_phy2>; + phy-mode =3D "internal"; + }; + + ethernet-port@3 { + reg =3D <3>; + label =3D "lan1"; + phy-handle =3D <&sw_phy3>; + phy-mode =3D "internal"; + }; + + ethernet-port@5 { + reg =3D <5>; + ethernet =3D <&fec>; + phy-mode =3D "rgmii-id"; + + fixed-link { + speed =3D <1000>; + full-duplex; + }; + }; + }; + }; + }; + - | + #include + mdio { + #address-cells =3D <1>; + #size-cells =3D <0>; + + ethernet-switch@0 { + compatible =3D "marvell,mv88e6190"; + #interrupt-cells =3D <2>; + interrupt-controller; + interrupt-parent =3D <&gpio1>; + interrupts =3D <7 IRQ_TYPE_LEVEL_LOW>; + pinctrl-0 =3D <&switch_interrupt_pins>; + pinctrl-names =3D "default"; + reg =3D <0>; + + mdio { + #address-cells =3D <1>; + #size-cells =3D <0>; + + switch0phy1: ethernet-phy@1 { + reg =3D <0x1>; + }; + + switch0phy2: ethernet-phy@2 { + reg =3D <0x2>; + }; + + switch0phy3: ethernet-phy@3 { + reg =3D <0x3>; + }; + + switch0phy4: ethernet-phy@4 { + reg =3D <0x4>; + }; + + switch0phy5: ethernet-phy@5 { + reg =3D <0x5>; + }; + + switch0phy6: ethernet-phy@6 { + reg =3D <0x6>; + }; + + switch0phy7: ethernet-phy@7 { + reg =3D <0x7>; + }; + + switch0phy8: ethernet-phy@8 { + reg =3D <0x8>; + }; + }; + + mdio-external { + compatible =3D "marvell,mv88e6xxx-mdio-external"; + #address-cells =3D <1>; + #size-cells =3D <0>; + + phy1: ethernet-phy@b { + reg =3D <0xb>; + compatible =3D "ethernet-phy-ieee802.3-c45"; + }; + + phy2: ethernet-phy@c { + reg =3D <0xc>; + compatible =3D "ethernet-phy-ieee802.3-c45"; + }; + }; + + ethernet-ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + ethernet-port@0 { + ethernet =3D <ð0>; + phy-mode =3D "rgmii"; + reg =3D <0>; + + fixed-link { + full-duplex; + pause; + speed =3D <1000>; + }; + }; + + ethernet-port@1 { + label =3D "lan1"; + phy-handle =3D <&switch0phy1>; + reg =3D <1>; + }; + + ethernet-port@2 { + label =3D "lan2"; + phy-handle =3D <&switch0phy2>; + reg =3D <2>; + }; + + ethernet-port@3 { + label =3D "lan3"; + phy-handle =3D <&switch0phy3>; + reg =3D <3>; + }; + + ethernet-port@4 { + label =3D "lan4"; + phy-handle =3D <&switch0phy4>; + reg =3D <4>; + }; + + ethernet-port@5 { + label =3D "lan5"; + phy-handle =3D <&switch0phy5>; + reg =3D <5>; + }; + + ethernet-port@6 { + label =3D "lan6"; + phy-handle =3D <&switch0phy6>; + reg =3D <6>; + }; + + ethernet-port@7 { + label =3D "lan7"; + phy-handle =3D <&switch0phy7>; + reg =3D <7>; + }; + + ethernet-port@8 { + label =3D "lan8"; + phy-handle =3D <&switch0phy8>; + reg =3D <8>; + }; + + ethernet-port@9 { + /* 88X3310P external phy */ + label =3D "lan9"; + phy-handle =3D <&phy1>; + phy-mode =3D "xaui"; + reg =3D <9>; + }; + + ethernet-port@a { + /* 88X3310P external phy */ + label =3D "lan10"; + phy-handle =3D <&phy2>; + phy-mode =3D "xaui"; + reg =3D <0xa>; + }; + }; + }; + }; diff --git a/Documentation/devicetree/bindings/net/dsa/marvell.txt b/Docume= ntation/devicetree/bindings/net/dsa/marvell.txt deleted file mode 100644 index 6ec0c181b6db..000000000000 --- a/Documentation/devicetree/bindings/net/dsa/marvell.txt +++ /dev/null @@ -1,109 +0,0 @@ -Marvell DSA Switch Device Tree Bindings ---------------------------------------- - -WARNING: This binding is currently unstable. Do not program it into a -FLASH never to be changed again. Once this binding is stable, this -warning will be removed. - -If you need a stable binding, use the old dsa.txt binding. - -Marvell Switches are MDIO devices. The following properties should be -placed as a child node of an mdio device. - -The properties described here are those specific to Marvell devices. -Additional required and optional properties can be found in dsa.txt. - -The compatibility string is used only to find an identification register, -which is at a different MDIO base address in different switch families. -- "marvell,mv88e6085" : Switch has base address 0x10. Use with models: - 6085, 6095, 6097, 6123, 6131, 6141, 6161, 6165, - 6171, 6172, 6175, 6176, 6185, 6240, 6320, 6321, - 6341, 6350, 6351, 6352 -- "marvell,mv88e6190" : Switch has base address 0x00. Use with models: - 6190, 6190X, 6191, 6290, 6361, 6390, 6390X -- "marvell,mv88e6250" : Switch has base address 0x08 or 0x18. Use with mod= el: - 6220, 6250 - -Required properties: -- compatible : Should be one of "marvell,mv88e6085", - "marvell,mv88e6190" or "marvell,mv88e6250" as - indicated above -- reg : Address on the MII bus for the switch. - -Optional properties: - -- reset-gpios : Should be a gpio specifier for a reset line -- interrupts : Interrupt from the switch -- interrupt-controller : Indicates the switch is itself an interrupt - controller. This is used for the PHY interrupts. -#interrupt-cells =3D <2> : Controller uses two cells, number and flag -- eeprom-length : Set to the length of an EEPROM connected to the - switch. Must be set if the switch can not detect - the presence and/or size of a connected EEPROM, - otherwise optional. -- mdio : Container of PHY and devices on the switches MDIO - bus. -- mdio? : Container of PHYs and devices on the external MDIO - bus. The node must contains a compatible string of - "marvell,mv88e6xxx-mdio-external" - -Example: - - mdio { - #address-cells =3D <1>; - #size-cells =3D <0>; - interrupt-parent =3D <&gpio0>; - interrupts =3D <27 IRQ_TYPE_LEVEL_LOW>; - interrupt-controller; - #interrupt-cells =3D <2>; - - switch0: switch@0 { - compatible =3D "marvell,mv88e6085"; - reg =3D <0>; - reset-gpios =3D <&gpio5 1 GPIO_ACTIVE_LOW>; - - mdio { - #address-cells =3D <1>; - #size-cells =3D <0>; - switch1phy0: switch1phy0@0 { - reg =3D <0>; - interrupt-parent =3D <&switch0>; - interrupts =3D <0 IRQ_TYPE_LEVEL_HIGH>; - }; - }; - }; - }; - - mdio { - #address-cells =3D <1>; - #size-cells =3D <0>; - interrupt-parent =3D <&gpio0>; - interrupts =3D <27 IRQ_TYPE_LEVEL_LOW>; - interrupt-controller; - #interrupt-cells =3D <2>; - - switch0: switch@0 { - compatible =3D "marvell,mv88e6190"; - reg =3D <0>; - reset-gpios =3D <&gpio5 1 GPIO_ACTIVE_LOW>; - - mdio { - #address-cells =3D <1>; - #size-cells =3D <0>; - switch1phy0: switch1phy0@0 { - reg =3D <0>; - interrupt-parent =3D <&switch0>; - interrupts =3D <0 IRQ_TYPE_LEVEL_HIGH>; - }; - }; - - mdio1 { - compatible =3D "marvell,mv88e6xxx-mdio-external"; - #address-cells =3D <1>; - #size-cells =3D <0>; - switch1phy9: switch1phy0@9 { - reg =3D <9>; - }; - }; - }; - }; diff --git a/MAINTAINERS b/MAINTAINERS index 90f13281d297..1b4475254d27 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12625,7 +12625,7 @@ MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER M: Andrew Lunn L: netdev@vger.kernel.org S: Maintained -F: Documentation/devicetree/bindings/net/dsa/marvell.txt +F: Documentation/devicetree/bindings/net/dsa/marvell,mv88e6xxx.yaml F: Documentation/networking/devlink/mv88e6xxx.rst F: drivers/net/dsa/mv88e6xxx/ F: include/linux/dsa/mv88e6xxx.h --=20 2.34.1 From nobody Tue Dec 30 17:01:00 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 90E18C4332F for ; Mon, 13 Nov 2023 23:36:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232176AbjKMXgg (ORCPT ); Mon, 13 Nov 2023 18:36:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230366AbjKMXgR (ORCPT ); Mon, 13 Nov 2023 18:36:17 -0500 Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 695541729 for ; Mon, 13 Nov 2023 15:36:08 -0800 (PST) Received: by mail-lj1-x229.google.com with SMTP id 38308e7fff4ca-2c6efcef4eeso66133231fa.1 for ; Mon, 13 Nov 2023 15:36:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699918566; x=1700523366; 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=XzpjgIoTApBpg6RH8jtn7hI12q8Te+BGFiuT3n+0Mpg=; b=uU/KBqdwoiS0R7cUYvjtAYtLQGt3GqnCwBeS+O0UWPG6cQRV2s+ceDoE11Z5miV8ug 85GBJc/C9N9iPO0upMx83NZBjqYX9U7OPLMCjlpFLjiQM4mzQ8T04cuL77oql77j7/BW tIF8GbUsSi4fBhiC4bqtwc/ju3WioxwcyM1CFrdUgSSL9CJUUcNE/SpYxUHe6PsdsWes fBwVm+smyqXEy9uKl39N7xjNZcNktMA4jv4zQGWJpZNbVPL0duaKdfUOYO2oXxSChI2m gD3oaWVXa2xPEqwBFsbTOX2olo9wUd6pz/dXX2KjAEltW6wFEbr67P4ZCYePmFQ8PZHw j1TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699918566; x=1700523366; 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=XzpjgIoTApBpg6RH8jtn7hI12q8Te+BGFiuT3n+0Mpg=; b=jRHvqo/AfEhSwRrihTKEYHvgkBBAZiWYIXyMEUD408addp+UF5DNk+EkLJqNpBoqLl Q1f+TeY5yoca7zrw+PZK/A0mlq4jxmpjqAi8FFH06LPYQ3uQZvY/oeXcS09P4EDEvUZ+ kBJTNbzGgBudMchCzhkrFmU6TxDNAl2x8Vxepwha7zsrtlsNuEFt4r6kTcAouhvFug8D NFSoF+vHogiYxHX2/7YUr3j6hBSBEIILf/nSvAozTgiysbxhokpV++mjNf9c5SfhBvrT KJ/UplY6lrTYuEOa1WutQFWXojsVT/AyvJDSVj/Pv+ccRHw/OpA9WdEzYpFQ4wgfj809 RcKA== X-Gm-Message-State: AOJu0YweSA99UlyTrghsJ8YihurotBuStBgGqHWcJkDDvL+OEjkXyuqB Uh8QziyuJHIe9kHYVtQoSKPYvA== X-Google-Smtp-Source: AGHT+IFNcKHf6oE6p5RPbdVx7uMMDCSOP+eTKVss4Nmp8f/70WXA9vQVoDVofrpkOT5vFPot1i3/QQ== X-Received: by 2002:a2e:bc28:0:b0:2c6:eccb:344d with SMTP id b40-20020a2ebc28000000b002c6eccb344dmr646562ljf.40.1699918566771; Mon, 13 Nov 2023 15:36:06 -0800 (PST) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 17-20020a2e0611000000b002b70a8478ddsm1202859ljg.44.2023.11.13.15.36.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 15:36:06 -0800 (PST) From: Linus Walleij Date: Tue, 14 Nov 2023 00:36:03 +0100 Subject: [PATCH net-next v8 8/9] ARM64: dts: Add special compatibles for the Turris Mox MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231114-marvell-88e6152-wan-led-v8-8-50688741691b@linaro.org> References: <20231114-marvell-88e6152-wan-led-v8-0-50688741691b@linaro.org> In-Reply-To: <20231114-marvell-88e6152-wan-led-v8-0-50688741691b@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 X-Mailer: b4 0.12.4 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org These special compatibles are added to the Marvell Armada 3720 Turris Mox in order to be able to special-case and avoid warnings on the non-standard nodenames that are ABI on this one board due to being used in deployed versions of U-Boot. Signed-off-by: Linus Walleij --- arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/= arm64/boot/dts/marvell/armada-3720-turris-mox.dts index 66cd98b67744..a89747d2a600 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts @@ -312,7 +312,7 @@ phy1: ethernet-phy@1 { * Also do not touch the "ports" or "port@n" nodes. These are also ABI. */ switch0@10 { - compatible =3D "marvell,mv88e6190"; + compatible =3D "marvell,turris-mox-mv88e6190", "marvell,mv88e6190"; reg =3D <0x10>; dsa,member =3D <0 0>; interrupt-parent =3D <&moxtet>; @@ -438,7 +438,7 @@ port-sfp@a { =20 /* NOTE: this node name is ABI, don't change it! */ switch0@2 { - compatible =3D "marvell,mv88e6085"; + compatible =3D "marvell,turris-mox-mv88e6085", "marvell,mv88e6085"; reg =3D <0x2>; dsa,member =3D <0 0>; interrupt-parent =3D <&moxtet>; @@ -506,7 +506,7 @@ port@5 { =20 /* NOTE: this node name is ABI, don't change it! */ switch1@11 { - compatible =3D "marvell,mv88e6190"; + compatible =3D "marvell,turris-mox-mv88e6190", "marvell,mv88e6190"; reg =3D <0x11>; dsa,member =3D <0 1>; interrupt-parent =3D <&moxtet>; @@ -632,7 +632,7 @@ port-sfp@a { =20 /* NOTE: this node name is ABI, don't change it! */ switch1@2 { - compatible =3D "marvell,mv88e6085"; + compatible =3D "marvell,turris-mox-mv88e6085", "marvell,mv88e6085"; reg =3D <0x2>; dsa,member =3D <0 1>; interrupt-parent =3D <&moxtet>; @@ -700,7 +700,7 @@ port@5 { =20 /* NOTE: this node name is ABI, don't change it! */ switch2@12 { - compatible =3D "marvell,mv88e6190"; + compatible =3D "marvell,turris-mox-mv88e6190", "marvell,mv88e6190"; reg =3D <0x12>; dsa,member =3D <0 2>; interrupt-parent =3D <&moxtet>; @@ -817,7 +817,7 @@ port-sfp@a { =20 /* NOTE: this node name is ABI, don't change it! */ switch2@2 { - compatible =3D "marvell,mv88e6085"; + compatible =3D "marvell,turris-mox-mv88e6085", "marvell,mv88e6085"; reg =3D <0x2>; dsa,member =3D <0 2>; interrupt-parent =3D <&moxtet>; --=20 2.34.1 From nobody Tue Dec 30 17:01:00 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 27A2AC4332F for ; Mon, 13 Nov 2023 23:36:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232191AbjKMXgk (ORCPT ); Mon, 13 Nov 2023 18:36:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231977AbjKMXgS (ORCPT ); Mon, 13 Nov 2023 18:36:18 -0500 Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ACF7A173C for ; Mon, 13 Nov 2023 15:36:09 -0800 (PST) Received: by mail-lj1-x231.google.com with SMTP id 38308e7fff4ca-2c6cb4a79deso54775051fa.1 for ; Mon, 13 Nov 2023 15:36:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699918568; x=1700523368; 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=lIz/GtmN1t9bIiyorUy96/+eOLVRUGVLvuVaAhEDkG8=; b=OdgI0zWmy9KTh8RatOScq/MmE9nEeSB7fThpWdc4w7s68S0HWOOS9Ufcyn87JiUFH3 30cMbwkZnE1h9RTkgP0NMjpbg/GZfSESdT9xhEWrwMYlGkvDQhm9cbYnDBYYbAMR0eBx QglxdpHS/iPrhyE0vNTHl6rgPlOga1UiyVz5nu5c3mhO/XHHhUFUdGlskuQ2NcffSYCb 0N1QESSM/K7CyOfi5b9GjrmVJS5wvuo9hdgKM96kuNRwp1YeyWgx5qOFHDe5u1efQBvz 2aIoaOuyQticBmGL4YbVKBhEfhKxRCQeEV7UG33g+W4/6Xppf8QHze1ZbXI8wIkt9jAa Vy6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699918568; x=1700523368; 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=lIz/GtmN1t9bIiyorUy96/+eOLVRUGVLvuVaAhEDkG8=; b=GlsuqY/vItFnRSUEFZ3KeqL0WwVfjY05NftkalEeH3tgH2aJxTtn9VN2/SmGMODfSE P0MwPNk//y/WFOCJIxwdcTbuVaV4pLcUMy84fq5vtcSiU2yJ0acRx8TYSxA53q5Pq9CY ZblAFHrGTOGznvZITExbwN3y1QygNiiYBs0iNZdshJ6yL2urMX8lfNP/XSNWk2FjwTF2 eD5iao14yI4pYklQNMGX1DbC47iobTbYnE8i60Yy983BCQa4qHnxWLX8hJeAObYaXLn6 eJeT8/r24fA6113cdP+hTgauRT99bk1ksvlkYyMOZaHWrRSX5BaG72FArvfu9+2j8zs0 ZpeA== X-Gm-Message-State: AOJu0YzNioGg46EHJLDoyzKZQrO120YvKYaW95WfZDk30kF/0rGK3ZXM sZ5AFlG1a5Y56ukoEB+PUIZAcw== X-Google-Smtp-Source: AGHT+IFxSldNF2UOlvgvflSNOcHswJutVDAUwO0Tw9t/H8g7uE54ZPrkfTELcjw4bqAhmaVslya7Cg== X-Received: by 2002:a2e:99ce:0:b0:2c3:e35d:13d with SMTP id l14-20020a2e99ce000000b002c3e35d013dmr183482ljj.5.1699918567898; Mon, 13 Nov 2023 15:36:07 -0800 (PST) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id 17-20020a2e0611000000b002b70a8478ddsm1202859ljg.44.2023.11.13.15.36.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 15:36:07 -0800 (PST) From: Linus Walleij Date: Tue, 14 Nov 2023 00:36:04 +0100 Subject: [PATCH net-next v8 9/9] dt-bindings: marvell: Add Marvell MV88E6060 DSA schema MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231114-marvell-88e6152-wan-led-v8-9-50688741691b@linaro.org> References: <20231114-marvell-88e6152-wan-led-v8-0-50688741691b@linaro.org> In-Reply-To: <20231114-marvell-88e6152-wan-led-v8-0-50688741691b@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 , Vladimir Oltean , Rob Herring , Florian Fainelli X-Mailer: b4 0.12.4 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Marvell MV88E6060 is one of the oldest DSA switches from Marvell, and it has DT bindings used in the wild. Let's define them properly. It is different enough from the rest of the MV88E6xxx switches that it deserves its own binding. Reviewed-by: Andrew Lunn Reviewed-by: Vladimir Oltean Reviewed-by: Rob Herring Reviewed-by: Florian Fainelli Signed-off-by: Linus Walleij --- .../bindings/net/dsa/marvell,mv88e6060.yaml | 88 ++++++++++++++++++= ++++ MAINTAINERS | 1 + 2 files changed, 89 insertions(+) diff --git a/Documentation/devicetree/bindings/net/dsa/marvell,mv88e6060.ya= ml b/Documentation/devicetree/bindings/net/dsa/marvell,mv88e6060.yaml new file mode 100644 index 000000000000..4f1adf00431a --- /dev/null +++ b/Documentation/devicetree/bindings/net/dsa/marvell,mv88e6060.yaml @@ -0,0 +1,88 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/dsa/marvell,mv88e6060.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Marvell MV88E6060 DSA switch + +maintainers: + - Andrew Lunn + +description: + The Marvell MV88E6060 switch has been produced and sold by Marvell + since at least 2008. The switch has one pin ADDR4 that controls the + MDIO address of the switch to be 0x10 or 0x00, and on the MDIO bus + connected to the switch, the PHYs inside the switch appear as + independent devices on address 0x00-0x04 or 0x10-0x14, so in difference + from many other DSA switches this switch does not have an internal + MDIO bus for the PHY devices. + +properties: + compatible: + const: marvell,mv88e6060 + description: + The MV88E6060 is the oldest Marvell DSA switch product, and + as such a bit limited in features compared to later hardware. + + reg: + maxItems: 1 + + reset-gpios: + description: + GPIO to be used to reset the whole device + maxItems: 1 + +allOf: + - $ref: dsa.yaml#/$defs/ethernet-ports + +required: + - compatible + - reg + +unevaluatedProperties: false + +examples: + - | + #include + #include + mdio { + #address-cells =3D <1>; + #size-cells =3D <0>; + + ethernet-switch@16 { + compatible =3D "marvell,mv88e6060"; + reg =3D <16>; + + ethernet-ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + ethernet-port@0 { + reg =3D <0>; + label =3D "lan1"; + }; + ethernet-port@1 { + reg =3D <1>; + label =3D "lan2"; + }; + ethernet-port@2 { + reg =3D <2>; + label =3D "lan3"; + }; + ethernet-port@3 { + reg =3D <3>; + label =3D "lan4"; + }; + ethernet-port@5 { + reg =3D <5>; + phy-mode =3D "rev-mii"; + ethernet =3D <ðc>; + fixed-link { + speed =3D <100>; + full-duplex; + }; + }; + }; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index 1b4475254d27..4c933a2a56ad 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12625,6 +12625,7 @@ MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER M: Andrew Lunn L: netdev@vger.kernel.org S: Maintained +F: Documentation/devicetree/bindings/net/dsa/marvell,mv88e6060.yaml F: Documentation/devicetree/bindings/net/dsa/marvell,mv88e6xxx.yaml F: Documentation/networking/devlink/mv88e6xxx.rst F: drivers/net/dsa/mv88e6xxx/ --=20 2.34.1