From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 2 Dec 2021 15:38:52 +0000 (+0100)
Subject: 5.4-stable patches
X-Git-Tag: v4.4.294~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54a738e4cf3ed4aa45496b0f29fd7ef1f554a273;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	arm64-dts-mcbin-support-2w-sfp-modules.patch
---

diff --git a/queue-5.4/arm64-dts-mcbin-support-2w-sfp-modules.patch b/queue-5.4/arm64-dts-mcbin-support-2w-sfp-modules.patch
new file mode 100644
index 00000000000..5cbf6346886
--- /dev/null
+++ b/queue-5.4/arm64-dts-mcbin-support-2w-sfp-modules.patch
@@ -0,0 +1,47 @@
+From 05abc6a5dec2a8c123a50235ecd1ad8d75ffa7b4 Mon Sep 17 00:00:00 2001
+From: Russell King <rmk+kernel@armlinux.org.uk>
+Date: Thu, 27 Feb 2020 12:08:58 +0000
+Subject: arm64: dts: mcbin: support 2W SFP modules
+
+From: Russell King <rmk+kernel@armlinux.org.uk>
+
+commit 05abc6a5dec2a8c123a50235ecd1ad8d75ffa7b4 upstream.
+
+Allow the SFP cages to be used with 2W SFP modules.
+
+Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
+Cc: Christian Lamparter <chunkeey@gmail.com>
+Cc: 照山周一郎 <teruyama@springboard-inc.jp>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
++++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
+@@ -71,6 +71,7 @@
+ 		tx-fault-gpio  = <&cp1_gpio1 26 GPIO_ACTIVE_HIGH>;
+ 		pinctrl-names = "default";
+ 		pinctrl-0 = <&cp1_sfpp0_pins>;
++		maximum-power-milliwatt = <2000>;
+ 	};
+ 
+ 	sfp_eth1: sfp-eth1 {
+@@ -83,6 +84,7 @@
+ 		tx-fault-gpio = <&cp0_gpio2 30 GPIO_ACTIVE_HIGH>;
+ 		pinctrl-names = "default";
+ 		pinctrl-0 = <&cp1_sfpp1_pins &cp0_sfpp1_pins>;
++		maximum-power-milliwatt = <2000>;
+ 	};
+ 
+ 	sfp_eth3: sfp-eth3 {
+@@ -95,6 +97,7 @@
+ 		tx-fault-gpio = <&cp0_gpio2 19 GPIO_ACTIVE_HIGH>;
+ 		pinctrl-names = "default";
+ 		pinctrl-0 = <&cp0_sfp_1g_pins &cp1_sfp_1g_pins>;
++		maximum-power-milliwatt = <2000>;
+ 	};
+ };
+ 
diff --git a/queue-5.4/series b/queue-5.4/series
index 58fb6554642..69134cc60e3 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -1,2 +1,3 @@
 nfsv42-fix-pagecache-invalidation-after-copy-clone.patch
 of-clk-make-linux-of_clk.h-self-contained.patch
+arm64-dts-mcbin-support-2w-sfp-modules.patch