From: Greg Kroah-Hartman Date: Mon, 9 Nov 2020 12:46:09 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v4.4.242~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ba03cee2d2709fac87fc7dd3d3eff37a628a39b;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: arm64-dts-marvell-espressobin-add-ethernet-alias.patch --- 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 index 00000000000..47ee9b5b5b9 --- /dev/null +++ b/queue-4.14/arm64-dts-marvell-espressobin-add-ethernet-alias.patch @@ -0,0 +1,36 @@ +From 5253cb8c00a6f4356760efb38bca0e0393aa06de Mon Sep 17 00:00:00 2001 +From: Tomasz Maciej Nowak +Date: Thu, 27 Feb 2020 17:52:32 +0100 +Subject: arm64: dts: marvell: espressobin: add ethernet alias + +From: Tomasz Maciej Nowak + +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 +Signed-off-by: Gregory CLEMENT +[pali: Backported to 4.14] +Signed-off-by: Pali Rohár +Signed-off-by: Greg Kroah-Hartman + +--- + 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 = ð0; ++ }; ++ + chosen { + stdout-path = "serial0:115200n8"; + }; diff --git a/queue-4.14/series b/queue-4.14/series index 2944c078ac7..a8475f21d6d 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -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