All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Pali Rohár" <pali@kernel.org>
To: stable@vger.kernel.org
Cc: gregkh@linuxfoundation.org, a.heider@gmail.com, andrew@lunn.ch,
	gregory.clement@bootlin.com
Subject: [PATCH] arm64: dts: marvell: espressobin: Add ethernet switch aliases
Date: Wed,  4 Nov 2020 12:52:09 +0100	[thread overview]
Message-ID: <20201104115209.1282-1-pali@kernel.org> (raw)

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: <stable@vger.kernel.org> # a2c7023f7075c: dsa: read mac address
Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Andre Heider <a.heider@gmail.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
[pali: Backported Espressobin rev V5 changes to 5.4 and 4.19 versions]

---
This patch is backport for 5.4 and 4.19 stable releases. From original
patch were removed changes for Espressobin revision V7 as these older
kernel versions have DTS files only for Espressobin revision V5.

Note that this patch depends on commit a2c7023f7075c ("dsa: read mac
address") as stated on Cc: line and for 4.19 release needs to be
backported first.
---
 .../boot/dts/marvell/armada-3720-espressobin.dts     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
index 05dc58c13fa4..6226e7e80980 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
@@ -21,6 +21,10 @@
 
 	aliases {
 		ethernet0 = &eth0;
+		/* for dsa slave device */
+		ethernet1 = &switch0port1;
+		ethernet2 = &switch0port2;
+		ethernet3 = &switch0port3;
 		serial0 = &uart0;
 		serial1 = &uart1;
 	};
@@ -147,7 +151,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			port@0 {
+			switch0port0: port@0 {
 				reg = <0>;
 				label = "cpu";
 				ethernet = <&eth0>;
@@ -158,19 +162,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


             reply	other threads:[~2020-11-04 11:53 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-04 11:52 Pali Rohár [this message]
2020-11-09 12:23 ` [PATCH] arm64: dts: marvell: espressobin: Add ethernet switch aliases Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2020-09-07 11:27 Pali Rohár
2020-09-07 11:27 ` Pali Rohár
2020-09-07 14:42 ` Andrew Lunn
2020-09-07 14:42   ` Andrew Lunn
2020-09-07 14:52   ` Pali Rohár
2020-09-07 14:52     ` Pali Rohár
2020-09-07 15:43     ` Andrew Lunn
2020-09-07 15:43       ` Andrew Lunn
2020-09-07 16:13       ` Pali Rohár
2020-09-07 16:13         ` Pali Rohár
2020-09-07 17:23         ` Andrew Lunn
2020-09-07 17:23           ` Andrew Lunn
2020-09-08  7:47           ` Pali Rohár
2020-09-08  7:47             ` Pali Rohár
2020-09-23 16:19             ` Pali Rohár
2020-09-23 16:19               ` Pali Rohár
2020-09-24  8:15               ` Gregory CLEMENT
2020-09-24  8:15                 ` Gregory CLEMENT
2020-09-07 17:13 ` Andre Heider
2020-09-07 17:13   ` Andre Heider
2020-09-07 17:23   ` Andrew Lunn
2020-09-07 17:23     ` Andrew Lunn
2020-09-07 17:35     ` Pali Rohár
2020-09-07 17:35       ` Pali Rohár
2020-09-07 17:43       ` Andre Heider
2020-09-07 17:43         ` Andre Heider
2020-09-07 17:47         ` Pali Rohár
2020-09-07 17:47           ` Pali Rohár
2020-09-07 17:50           ` Andre Heider
2020-09-07 17:50             ` Andre Heider
2020-09-07 18:50           ` Andrew Lunn
2020-09-07 18:50             ` Andrew Lunn
2020-09-07 17:42   ` Pali Rohár
2020-09-07 17:42     ` Pali Rohár
2020-09-07 17:44     ` Andre Heider
2020-09-07 17:44       ` Andre Heider
2020-09-23 15:01 ` Gregory CLEMENT
2020-09-23 15:01   ` Gregory CLEMENT

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201104115209.1282-1-pali@kernel.org \
    --to=pali@kernel.org \
    --cc=a.heider@gmail.com \
    --cc=andrew@lunn.ch \
    --cc=gregkh@linuxfoundation.org \
    --cc=gregory.clement@bootlin.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.