From: Russell King <linux@armlinux.org.uk>
Date: Thu, 21 May 2020 08:57:32 +0000 (+0100)
Subject: kernel: backport the I2C bus recovery for uDPU
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6593ea23e5173861e44f5f6a6fe3e7e6c3978f17;p=openwrt%2Fstaging%2Fluka.git

kernel: backport the I2C bus recovery for uDPU

Backport the I2C bus recovery DT configuration for the uDPU that has
been queued for 5.8.

Signed-off-by: Russell King <linux@armlinux.org.uk>
---

diff --git a/target/linux/mvebu/patches-5.4/551-v5.8-arm64-dts-add-uDPU-i2c-bus-recovery.patch b/target/linux/mvebu/patches-5.4/551-v5.8-arm64-dts-add-uDPU-i2c-bus-recovery.patch
new file mode 100644
index 0000000000..b1c508abab
--- /dev/null
+++ b/target/linux/mvebu/patches-5.4/551-v5.8-arm64-dts-add-uDPU-i2c-bus-recovery.patch
@@ -0,0 +1,60 @@
+From: Russell King <rmk+kernel@armlinux.org.uk>
+Bcc: linux@mail.armlinux.org.uk
+Cc: Vladimir Vid <vladimir.vid@sartura.hr>,Jason Cooper <jason@lakedaemon.net>,Andrew Lunn <andrew@lunn.ch>,Gregory Clement <gregory.clement@bootlin.com>,Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>,Rob Herring <robh+dt@kernel.org>,Mark Rutland <mark.rutland@arm.com>,linux-arm-kernel@lists.infradead.org,devicetree@vger.kernel.org
+Subject: [PATCH] arm64: dts: add uDPU i2c bus recovery
+MIME-Version: 1.0
+Content-Disposition: inline
+Content-Transfer-Encoding: 8bit
+Content-Type: text/plain; charset="utf-8"
+
+Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
+---
+ .../boot/dts/marvell/armada-3720-uDPU.dts     | 22 +++++++++++++++++--
+ 1 file changed, 20 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
+index 7eb6c1796cef..95d46e8d081c 100644
+--- a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
++++ b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
+@@ -117,18 +117,36 @@
+ 	};
+ };
+ 
++&pinctrl_nb {
++	i2c1_recovery_pins: i2c1-recovery-pins {
++		groups = "i2c1";
++		function = "gpio";
++	};
++
++	i2c2_recovery_pins: i2c2-recovery-pins {
++		groups = "i2c2";
++		function = "gpio";
++	};
++};
++
+ &i2c0 {
+ 	status = "okay";
+-	pinctrl-names = "default";
++	pinctrl-names = "default", "recovery";
+ 	pinctrl-0 = <&i2c1_pins>;
++	pinctrl-1 = <&i2c1_recovery_pins>;
+ 	/delete-property/mrvl,i2c-fast-mode;
++	scl-gpios = <&gpionb 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
++	sda-gpios = <&gpionb 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ };
+ 
+ &i2c1 {
+ 	status = "okay";
+-	pinctrl-names = "default";
++	pinctrl-names = "default", "recovery";
+ 	pinctrl-0 = <&i2c2_pins>;
++	pinctrl-1 = <&i2c2_recovery_pins>;
+ 	/delete-property/mrvl,i2c-fast-mode;
++	scl-gpios = <&gpionb 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
++	sda-gpios = <&gpionb 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ 
+ 	lm75@48 {
+ 		status = "okay";
+-- 
+2.20.1
+