]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 Nov 2020 12:46:09 +0000 (13:46 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 Nov 2020 12:46:09 +0000 (13:46 +0100)
added patches:
arm64-dts-marvell-espressobin-add-ethernet-alias.patch

queue-4.14/arm64-dts-marvell-espressobin-add-ethernet-alias.patch [new file with mode: 0644]
queue-4.14/series

diff --git a/queue-4.14/arm64-dts-marvell-espressobin-add-ethernet-alias.patch b/queue-4.14/arm64-dts-marvell-espressobin-add-ethernet-alias.patch
new file mode 100644 (file)
index 0000000..47ee9b5
--- /dev/null
@@ -0,0 +1,36 @@
+From 5253cb8c00a6f4356760efb38bca0e0393aa06de Mon Sep 17 00:00:00 2001
+From: Tomasz Maciej Nowak <tmn505@gmail.com>
+Date: Thu, 27 Feb 2020 17:52:32 +0100
+Subject: arm64: dts: marvell: espressobin: add ethernet alias
+
+From: Tomasz Maciej Nowak <tmn505@gmail.com>
+
+commit 5253cb8c00a6f4356760efb38bca0e0393aa06de upstream.
+
+The maker of this board and its variants, stores MAC address in U-Boot
+environment. Add alias for bootloader to recognise, to which ethernet
+node inject the factory MAC address.
+
+Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
+Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
+[pali: Backported to 4.14]
+Signed-off-by: Pali Rohár <pali@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
++++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
+@@ -52,6 +52,10 @@
+       model = "Globalscale Marvell ESPRESSOBin Board";
+       compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
++      aliases {
++              ethernet0 = &eth0;
++      };
++
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
index 2944c078ac7b1f1b6cc31fef6d8878a37821d04a..a8475f21d6da0eb23f8faf78b046f3cd39efc21e 100644 (file)
@@ -45,3 +45,4 @@ usb-mtu3-fix-panic-in-mtu3_gadget_stop.patch
 arc-stack-unwinding-avoid-indefinite-looping.patch
 revert-arc-entry-fix-potential-efa-clobber-when-tif_syscall_trace.patch
 pm-runtime-resume-the-device-earlier-in-__device_release_driver.patch
+arm64-dts-marvell-espressobin-add-ethernet-alias.patch