From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 9 Nov 2020 12:46:49 +0000 (+0100)
Subject: 5.4-stable patches
X-Git-Tag: v4.4.242~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ac7af8d5abde6c5d04a8e17ed8a539b24a550669;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	arm64-dts-marvell-espressobin-add-ethernet-switch-aliases.patch
---

diff --git a/queue-5.4/arm64-dts-marvell-espressobin-add-ethernet-switch-aliases.patch b/queue-5.4/arm64-dts-marvell-espressobin-add-ethernet-switch-aliases.patch
new file mode 100644
index 00000000000..53e21fd5450
--- /dev/null
+++ b/queue-5.4/arm64-dts-marvell-espressobin-add-ethernet-switch-aliases.patch
@@ -0,0 +1,85 @@
+From b64d814257b027e29a474bcd660f6372490138c7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
+Date: Mon, 7 Sep 2020 13:27:17 +0200
+Subject: arm64: dts: marvell: espressobin: Add ethernet switch aliases
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Pali Rohár <pali@kernel.org>
+
+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]
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts |   12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+--- 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>;
diff --git a/queue-5.4/series b/queue-5.4/series
index 870c56f414d..2d5d46b9b50 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -82,3 +82,4 @@ pm-runtime-drop-pm_runtime_clean_up_links.patch
 pm-runtime-resume-the-device-earlier-in-__device_release_driver.patch
 xfs-flush-for-older-xfs-specific-ioctls.patch
 perf-core-fix-a-memory-leak-in-perf_event_parse_addr_filter.patch
+arm64-dts-marvell-espressobin-add-ethernet-switch-aliases.patch