From: Greg Kroah-Hartman Date: Thu, 25 Jan 2024 17:29:47 +0000 (-0800) Subject: 5.10-stable patches X-Git-Tag: v4.19.306~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae0c4f88411e927231cfd0a50a55a98bd50ab020;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: arm64-dts-armada-3720-turris-mox-set-irq-type-for-rtc.patch --- diff --git a/queue-5.10/arm64-dts-armada-3720-turris-mox-set-irq-type-for-rtc.patch b/queue-5.10/arm64-dts-armada-3720-turris-mox-set-irq-type-for-rtc.patch new file mode 100644 index 00000000000..e1fee94ed0b --- /dev/null +++ b/queue-5.10/arm64-dts-armada-3720-turris-mox-set-irq-type-for-rtc.patch @@ -0,0 +1,37 @@ +From fca8a117c1c9a0f8b8feed117db34cf58134dc2c Mon Sep 17 00:00:00 2001 +From: Sjoerd Simons +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 + +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 +Cc: # v6.2+ +Fixes: 21aad8ba615e ("arm64: dts: armada-3720-turris-mox: Add missing interrupt for RTC") +Reviewed-by: Marek Behún +Signed-off-by: Gregory CLEMENT +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -129,7 +129,7 @@ + compatible = "microchip,mcp7940x"; + reg = <0x6f>; + interrupt-parent = <&gpiosb>; +- interrupts = <5 0>; /* GPIO2_5 */ ++ interrupts = <5 IRQ_TYPE_EDGE_FALLING>; /* GPIO2_5 */ + }; + }; + diff --git a/queue-5.10/series b/queue-5.10/series index bb8db500dea..eae01a4f265 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -284,3 +284,4 @@ selftests-mlxsw-qos_pfc-convert-to-iproute2-dcb.patch selftests-mlxsw-qos_pfc-adjust-the-test-to-support-8.patch i2c-s3c24xx-fix-read-transfers-in-polling-mode.patch i2c-s3c24xx-fix-transferring-more-than-one-message-i.patch +arm64-dts-armada-3720-turris-mox-set-irq-type-for-rtc.patch