From e0f5ed10eeb08976edf39a1d997c2de489da5f46 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 25 Jan 2024 09:31:17 -0800 Subject: [PATCH] 6.7-stable patches added patches: arm64-dts-armada-3720-turris-mox-set-irq-type-for-rtc.patch --- ...3720-turris-mox-set-irq-type-for-rtc.patch | 37 +++++++++++++++++++ queue-6.7/series | 1 + 2 files changed, 38 insertions(+) create mode 100644 queue-6.7/arm64-dts-armada-3720-turris-mox-set-irq-type-for-rtc.patch diff --git a/queue-6.7/arm64-dts-armada-3720-turris-mox-set-irq-type-for-rtc.patch b/queue-6.7/arm64-dts-armada-3720-turris-mox-set-irq-type-for-rtc.patch new file mode 100644 index 00000000000..0c0c9704564 --- /dev/null +++ b/queue-6.7/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 +@@ -130,7 +130,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-6.7/series b/queue-6.7/series index 9a48d59526d..585dd0a8eeb 100644 --- a/queue-6.7/series +++ b/queue-6.7/series @@ -637,3 +637,4 @@ ipv6-mcast-fix-data-race-in-ipv6_mc_down-mld_ifc_wor.patch i2c-s3c24xx-fix-read-transfers-in-polling-mode.patch i2c-s3c24xx-fix-transferring-more-than-one-message-i.patch revert-keys-encrypted-add-check-for-strsep.patch +arm64-dts-armada-3720-turris-mox-set-irq-type-for-rtc.patch -- 2.47.3