From nobody Wed Dec 17 12:45:10 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 96CE8C4167B for ; Mon, 27 Nov 2023 15:51:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234235AbjK0Pvs (ORCPT ); Mon, 27 Nov 2023 10:51:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234148AbjK0Pvd (ORCPT ); Mon, 27 Nov 2023 10:51:33 -0500 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C06A11987 for ; Mon, 27 Nov 2023 07:51:26 -0800 (PST) Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-507cd62472dso5481481e87.0 for ; Mon, 27 Nov 2023 07:51:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701100285; x=1701705085; 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=hvWGrEYR7mp8sTGj6EKKCVJ+OmKjVs/Bmj1dFXycNKVt5be1FTaZlJ3o1Fjca8JcZB rmBA24cq344vvVlsBpOF7sRuvPBVCVS8aYrev+MeOiQ+/2ak+XHvNrYX+Xh83wY8FKcE WSquhF29wF5GR4hTLfe+nJ4ZGSxWBC1bIb1hclQDnacQpxcJf+PNxg7OCj1Ndy58z6C4 LbtKBiN91qU2RM8noc5O/c3di21mNoGZSUdxeG267aCXT0R5XlP5sCOBOQZBuXvkuzzh f/EEQY7xK9RZx5PG2it3Vi74Cl7aqkwN6w5vSiTGtHzlmIZuPPUwfrBmCVf5k3WAPyY7 y19g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701100285; x=1701705085; 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=HR70u6/tELdbmrZE/w46saXyziDSINnvamLC4v79xt+yx4yPgqpaCl59WTElanYdae udoxk08XYLnBlStT31s+WGF9oBJI9TX5TsRSb3bHrNMLvOgaKaVxHgVfffmQ6Y/kJzWm wg3EUJ49VixWzAJweAjlritcekkwA8bdnU0444XhXt8qeVb/ZPs6x1BpUXiQsEsArSJw VVLBDnsE0MK6/63LVmzs23+uRuigdCnBT1g65VnrZIT6GUvrTUtW4I7kHYto9t/BAeLR Mc1NSrR0DFa57J2B4lQYKQv358HXQ8TmQ16J7SJx4b3KycBLxWDzE7vaID6nJ2ezcXDC toQQ== X-Gm-Message-State: AOJu0YxBktIxrhCgtRNSr2hEUxd/uR9UGVTMGJOXoVERA7nnLwulnK0N 0KRT9vRjorof5KIJzICm6cI3w7DPqlcLechQqlA= X-Google-Smtp-Source: AGHT+IFDlNhpU5/2cPvg6Sb9707IhB1tmDJCABdscv/2wIjkBPaRRaVDS9v9AfQoCzQtCvdDGgboOA== X-Received: by 2002:a05:6512:2812:b0:50a:a6ea:405f with SMTP id cf18-20020a056512281200b0050aa6ea405fmr4140601lfb.4.1701100263437; Mon, 27 Nov 2023 07:51:03 -0800 (PST) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id b16-20020ac25e90000000b0050a71df5d39sm1515787lfq.300.2023.11.27.07.51.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 07:51:02 -0800 (PST) From: Linus Walleij Date: Mon, 27 Nov 2023 16:51:00 +0100 Subject: [PATCH v9 1/3] 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: <20231127-mv88e6xxx-mvebu-fixes-v9-1-d19b963e81fb@linaro.org> References: <20231127-mv88e6xxx-mvebu-fixes-v9-0-d19b963e81fb@linaro.org> In-Reply-To: <20231127-mv88e6xxx-mvebu-fixes-v9-0-d19b963e81fb@linaro.org> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Russell King Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@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 --- 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