Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp800995pxb; Tue, 3 Nov 2020 12:55:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJyDJBPw0VZl1nVwoTwdfZpJbO+UxTdKAPXvoSNW1BDfg1c16USFRTcMw/p1qBnO8E9dK7qQ X-Received: by 2002:a17:906:c8d8:: with SMTP id gc24mr12828561ejb.417.1604436942022; Tue, 03 Nov 2020 12:55:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604436942; cv=none; d=google.com; s=arc-20160816; b=YmxOgs4Cs4zwbQI31dVL/wn3ZnXbE3joZtqjj3xUldiFeGPxqbmH2LjcO8HrhYNfet 8WAzrfGFggS67VQM0w9VR+nHDUGnr0oESZtPYdVLkzWsWg4Rx4aM0BuhH+G4bA/4eM3E xhA/51tNX5hCFRjW1mDnHkLA+UOIvCP3ycHW3qaGa9DIWd65Ll5sCdTQVXnjIlp2FEa9 Y33oPXIe+sVEp68l/pTZyhwF6lJzAT6++xlyBvCmC64eW+UGKhpchvR44Qvtexz1eaRf TvismUg11wxkqQsaE1f8dSoH8olXk6SQwfVurz5paSzuniaJPbSOC4LSW/gqKdRA+MqT HQPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Ii4KkGRue04lzKNdHpg3ZswlYw+dnr0QkaFKTqU+9+o=; b=Hg9bqFN24AD87vOHdeQC8o0/bDvji1zRDMhGK1/HOIhsd/k4zZ9fpp0dCl8t80i0dw cUUzjDEEZD85epwtnyiwT3RemR/KcF02ltu3wAiukzWTvp1o4mXy6HARaxrvgcnO/ylO 59TwVeXlfPR5zfUQ8EYiC8f0kuGlLiDpaFJAvgb4ZTTHrLH34dUs4NyKel9BYN844LXH aULKhZ/vtZ10bNtQ0S0ppiUnDlz2WJNnNRng239+ey1OXA9lnKN8xgFqkkTTA690p7XO uF6IeBiWuYXvfb9mS2VLsAdt0bIeerFDu3reG8HOpVrTWwHVLmW6FnH9zVtc4h86gDAR EiTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0MMu6gfJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n19si6421409edv.187.2020.11.03.12.55.19; Tue, 03 Nov 2020 12:55:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0MMu6gfJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732038AbgKCUwL (ORCPT + 99 others); Tue, 3 Nov 2020 15:52:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:48032 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731418AbgKCUwC (ORCPT ); Tue, 3 Nov 2020 15:52:02 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B246422226; Tue, 3 Nov 2020 20:52:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436722; bh=ht3LeBio6+cRc0XRV+RP1Vy/WvDlFFlCEtlcc46tvvM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0MMu6gfJ0X8yAm6n2moq2rsUKWLMVMLoQWGZVrazd9WVWzEffgKR3DObDnZuRMZo6 sjUFk7/oo4l0tmHwbJeAlQO0jmwk1mmkm+JdqpcKapYvpqPFYdLdWuA/yt3SKHZ+HD nmQIIKa49toTkseC4WM/kjQCRyo8kALikdT03FfU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Pali=20Roh=C3=A1r?= , Andrew Lunn , Andre Heider , Gregory CLEMENT Subject: [PATCH 5.9 373/391] arm64: dts: marvell: espressobin: Add ethernet switch aliases Date: Tue, 3 Nov 2020 21:37:04 +0100 Message-Id: <20201103203412.316278533@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203348.153465465@linuxfoundation.org> References: <20201103203348.153465465@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pali Rohár commit b64d814257b027e29a474bcd660f6372490138c7 upstream. 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") Cc: # a2c7023f7075c: dsa: read mac address Signed-off-by: Pali Rohár Reviewed-by: Andrew Lunn Reviewed-by: Andre Heider Signed-off-by: Gregory CLEMENT Signed-off-by: Greg Kroah-Hartman --- arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts | 10 ++++++-- arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts | 10 ++++++-- arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi | 12 ++++++---- 3 files changed, 24 insertions(+), 8 deletions(-) --- 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>; --- 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>; --- 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>;