From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6153C4363D for ; Wed, 23 Sep 2020 15:02:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6419B21D43 for ; Wed, 23 Sep 2020 15:02:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726567AbgIWPCB convert rfc822-to-8bit (ORCPT ); Wed, 23 Sep 2020 11:02:01 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:59109 "EHLO relay3-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726130AbgIWPCB (ORCPT ); Wed, 23 Sep 2020 11:02:01 -0400 X-Greylist: delayed 1434 seconds by postgrey-1.27 at vger.kernel.org; Wed, 23 Sep 2020 11:02:00 EDT X-Originating-IP: 90.65.92.90 Received: from localhost (lfbn-lyo-1-1913-90.w90-65.abo.wanadoo.fr [90.65.92.90]) (Authenticated sender: gregory.clement@bootlin.com) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 7F8CC60023; Wed, 23 Sep 2020 15:01:54 +0000 (UTC) From: Gregory CLEMENT To: Pali =?utf-8?Q?Roh=C3=A1r?= , Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Rob Herring , Tomasz Maciej Nowak , Andre Heider Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] arm64: dts: marvell: espressobin: Add ethernet switch aliases In-Reply-To: <20200907112718.5994-1-pali@kernel.org> References: <20200907112718.5994-1-pali@kernel.org> Date: Wed, 23 Sep 2020 17:01:54 +0200 Message-ID: <875z84iljx.fsf@BL-laptop> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Hello Pali, > Espressobin boards have 3 ethernet ports and some of them got assigned more > then one MAC address. MAC addresses are stored in U-Boot environment. > > Since commit a2c7023f7075c ("net: dsa: read mac address from DT for slave > device") kernel can use MAC addresses from DT for particular DSA port. > > Currently Espressobin DTS file contains alias just for ethernet0. > > This patch defines additional ethernet aliases in Espressobin DTS files, so > bootloader can fill correct MAC address for DSA switch ports if more MAC > addresses were specified. > > DT alias ethernet1 is used for wan port, DT aliases ethernet2 and ethernet3 > are used for lan ports for both Espressobin revisions (V5 and V7). > > Fixes: 5253cb8c00a6f ("arm64: dts: marvell: espressobin: add ethernet alias") > Signed-off-by: Pali Rohár Applied on mvebu/fixes Thanks, Gregory > --- > .../dts/marvell/armada-3720-espressobin-v7-emmc.dts | 10 ++++++++-- > .../boot/dts/marvell/armada-3720-espressobin-v7.dts | 10 ++++++++-- > .../boot/dts/marvell/armada-3720-espressobin.dtsi | 12 ++++++++---- > 3 files changed, 24 insertions(+), 8 deletions(-) > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts > index 03733fd92732..215d2f702623 100644 > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts > @@ -20,17 +20,23 @@ > compatible = "globalscale,espressobin-v7-emmc", "globalscale,espressobin-v7", > "globalscale,espressobin", "marvell,armada3720", > "marvell,armada3710"; > + > + aliases { > + /* ethernet1 is wan port */ > + ethernet1 = &switch0port3; > + ethernet3 = &switch0port1; > + }; > }; > > &switch0 { > ports { > - port@1 { > + switch0port1: port@1 { > reg = <1>; > label = "lan1"; > phy-handle = <&switch0phy0>; > }; > > - port@3 { > + switch0port3: port@3 { > reg = <3>; > label = "wan"; > phy-handle = <&switch0phy2>; > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts > index 8570c5f47d7d..b6f4af8ebafb 100644 > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts > @@ -19,17 +19,23 @@ > model = "Globalscale Marvell ESPRESSOBin Board V7"; > compatible = "globalscale,espressobin-v7", "globalscale,espressobin", > "marvell,armada3720", "marvell,armada3710"; > + > + aliases { > + /* ethernet1 is wan port */ > + ethernet1 = &switch0port3; > + ethernet3 = &switch0port1; > + }; > }; > > &switch0 { > ports { > - port@1 { > + switch0port1: port@1 { > reg = <1>; > label = "lan1"; > phy-handle = <&switch0phy0>; > }; > > - port@3 { > + switch0port3: port@3 { > reg = <3>; > label = "wan"; > phy-handle = <&switch0phy2>; > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi > index b97218c72727..0775c16e0ec8 100644 > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi > @@ -13,6 +13,10 @@ > / { > aliases { > ethernet0 = ð0; > + /* for dsa slave device */ > + ethernet1 = &switch0port1; > + ethernet2 = &switch0port2; > + ethernet3 = &switch0port3; > serial0 = &uart0; > serial1 = &uart1; > }; > @@ -120,7 +124,7 @@ > #address-cells = <1>; > #size-cells = <0>; > > - port@0 { > + switch0port0: port@0 { > reg = <0>; > label = "cpu"; > ethernet = <ð0>; > @@ -131,19 +135,19 @@ > }; > }; > > - port@1 { > + switch0port1: port@1 { > reg = <1>; > label = "wan"; > phy-handle = <&switch0phy0>; > }; > > - port@2 { > + switch0port2: port@2 { > reg = <2>; > label = "lan0"; > phy-handle = <&switch0phy1>; > }; > > - port@3 { > + switch0port3: port@3 { > reg = <3>; > label = "lan1"; > phy-handle = <&switch0phy2>; > -- > 2.20.1 > -- Gregory Clement, Bootlin Embedded Linux and Kernel engineering http://bootlin.com