From nobody Wed Dec 17 10:58:51 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 CCF02C4167B for ; Mon, 27 Nov 2023 15:55:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234123AbjK0Pz2 (ORCPT ); Mon, 27 Nov 2023 10:55:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234133AbjK0PzS (ORCPT ); Mon, 27 Nov 2023 10:55:18 -0500 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A66FFD4B for ; Mon, 27 Nov 2023 07:55:23 -0800 (PST) Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2c878e228b4so54285651fa.1 for ; Mon, 27 Nov 2023 07:55:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701100522; x=1701705322; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=d8MMdLwOnB1QTRyQh+U10EChfRoJeTQS+0yevJYroxY=; b=jto7psFlX2DR/p/Stf266r/qEhGESEY3UxbdX7Wxau/vaVhponkXxeB137pWQMmeuo NRyxL+rWqzNDSXul6AdmZe0ivO78p1s+Waaia5xxTNRfJjaIfzis5B5RmwgYeUMubXJl nxSCr6BoIZCf09webal0L4MY9LRo8TuknWbp8hrq0z5tH6sdbh3dE0pBeByqO5pq/WRm Z50IaAOjBly1LKvKOc+ho7cN7QZjx6E6oWrDQnhvYj92qJ7bZ9NWSWp3rFgCtl+mBwhX MXBAVE5noFSxVFAmYpSmrPa9BrqNF+4DsUKS9MUeALTenmdTo/vEQP2X9BP0nCQmdafP Y89A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701100522; x=1701705322; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=d8MMdLwOnB1QTRyQh+U10EChfRoJeTQS+0yevJYroxY=; b=DEWzluplQ6yoALj0p6YyM8t7z9hzzaPJGPuPRsLaHe8jj0NDEzPFJc72PC2Bgr9UYm blaHw9WHCqUjVr2wVZZVIWfT47tJ73LY9vmkW5wTsg3b8uryrfnm1CCbu2rpvrju5s18 s7YJ65HFj8ufgVK+wHxftqFcIsQRE6NLOBUabVXyYkxiKM/D1RcGPmkGnw9sD4PTyA+Q AtGHknNrM9b//Ba4uzas5vf9muPLNlOWTGZgbZGyl3bjGWnD/N45A+wIglpdIhJLbK/+ 8okNFRiU1wA7graFQTF4MEU0sgichZE1AieNZoRoEPLxyLapUlFVHtbdBq9wk4icyQ0r XxBA== X-Gm-Message-State: AOJu0YzOQeolrkbeNYUGnZZk8U39KtRtdvMsOJNkuku9Yq00ljk/7ah2 JbKWsXNqFOsmrcaIl2NiKFF3og== X-Google-Smtp-Source: AGHT+IE1OqIhwgU4jjORM3hrnH4E+rMzDTpV6gTSV00HgWJZI5JtvgrxGvrJzepHDg5iyoyQUQW7Dw== X-Received: by 2002:a2e:998c:0:b0:2c5:19ab:7270 with SMTP id w12-20020a2e998c000000b002c519ab7270mr7364544lji.35.1701100521706; Mon, 27 Nov 2023 07:55:21 -0800 (PST) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id b1-20020a05651c032100b002bfff335ca1sm1386988ljp.79.2023.11.27.07.55.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 07:55:21 -0800 (PST) From: Linus Walleij Date: Mon, 27 Nov 2023 16:55:20 +0100 Subject: [PATCH v9] 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: <20231127-mv88e6xxx-nxp-v9-1-69f3f783f4af@linaro.org> X-B4-Tracking: v=1; b=H4sIAOe7ZGUC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyLHUUlJIzE vPSU3UzU4B8JSMDI2NDQyNz3dwyC4tUs4qKCt28igJdU/NUSwPDZBNTY4tUJaCegqLUtMwKsHn RsbW1AKsRE6dfAAAA To: Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Stefan Agner , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Andrew Lunn , Florian Fainelli , Linus Walleij 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 --- This patch is split off from the actual bindings so these can be merged to netdev. Applying it will fix warnings that will appear from device tree checks. Link to v9 bindings patches: https://lore.kernel.org/r/20231127-marvell-88e6152-wan-led-v9-0-272934e0468= 1@linaro.org --- 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"; }; --- base-commit: b85ea95d086471afb4ad062012a4d73cd328fa86 change-id: 20231127-mv88e6xxx-nxp-57e901c4538e Best regards, --=20 Linus Walleij