]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Jan 2024 17:29:24 +0000 (09:29 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Jan 2024 17:29:24 +0000 (09:29 -0800)
added patches:
arm64-dts-armada-3720-turris-mox-set-irq-type-for-rtc.patch

queue-5.4/arm64-dts-armada-3720-turris-mox-set-irq-type-for-rtc.patch [new file with mode: 0644]
queue-5.4/series

diff --git a/queue-5.4/arm64-dts-armada-3720-turris-mox-set-irq-type-for-rtc.patch b/queue-5.4/arm64-dts-armada-3720-turris-mox-set-irq-type-for-rtc.patch
new file mode 100644 (file)
index 0000000..86ae69f
--- /dev/null
@@ -0,0 +1,37 @@
+From fca8a117c1c9a0f8b8feed117db34cf58134dc2c Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd@collabora.com>
+Date: Tue, 28 Nov 2023 22:35:06 +0100
+Subject: arm64: dts: armada-3720-turris-mox: set irq type for RTC
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Sjoerd Simons <sjoerd@collabora.com>
+
+commit fca8a117c1c9a0f8b8feed117db34cf58134dc2c upstream.
+
+The rtc on the mox shares its interrupt line with the moxtet bus. Set
+the interrupt type to be consistent between both devices. This ensures
+correct setup of the interrupt line regardless of probing order.
+
+Signed-off-by: Sjoerd Simons <sjoerd@collabora.com>
+Cc: <stable@vger.kernel.org> # v6.2+
+Fixes: 21aad8ba615e ("arm64: dts: armada-3720-turris-mox: Add missing interrupt for RTC")
+Reviewed-by: Marek BehĂșn <kabel@kernel.org>
+Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
++++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
+@@ -127,7 +127,7 @@
+               compatible = "microchip,mcp7940x";
+               reg = <0x6f>;
+               interrupt-parent = <&gpiosb>;
+-              interrupts = <5 0>; /* GPIO2_5 */
++              interrupts = <5 IRQ_TYPE_EDGE_FALLING>; /* GPIO2_5 */
+       };
+ };
index 746dac95a3345bf6a1e9446e7daca2075506e385..cec252f8436916a63b81ae03f572207bdeb1996c 100644 (file)
@@ -191,3 +191,4 @@ mlxsw-spectrum_acl_erp-fix-error-flow-of-pool-alloca.patch
 i2c-s3c24xx-fix-read-transfers-in-polling-mode.patch
 i2c-s3c24xx-fix-transferring-more-than-one-message-i.patch
 perf-top-skip-side-band-event-setup-if-have_libbpf_support-is-not-set.patch
+arm64-dts-armada-3720-turris-mox-set-irq-type-for-rtc.patch