From 9a40fb9b04a5b05d816e268d4c937e7e341d932b Mon Sep 17 00:00:00 2001
From: Jonathan Bell <jonathan@raspberrypi.com>
Date: Thu, 12 Sep 2024 11:09:30 +0100
Subject: [PATCH] drivers: irq-bcm283x: swizzle interrupts on ARMv7 too

BCM2836 with Cortex-A7 cores has almost the same ARM_LOCAL interrupt
routing logic as BCM2837, so relax the compile guard to CONFIG_SMP not
CONFIG_ARM64.

Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
---
 drivers/irqchip/irq-bcm2835.c | 5 +++--
 drivers/irqchip/irq-bcm2836.c | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

--- a/drivers/irqchip/irq-bcm2835.c
+++ b/drivers/irqchip/irq-bcm2835.c
@@ -153,7 +153,8 @@ static void armctrl_unmask_irq(struct ir
 	}
 }
 
-#ifdef CONFIG_ARM64
+#if defined(CONFIG_SMP)
+void bcm2836_arm_irqchip_spin_gpu_irq(void);
 
 static void armctrl_ack_irq(struct irq_data *d)
 {
@@ -168,7 +169,7 @@ static struct irq_chip armctrl_chip = {
 	.irq_unmask = armctrl_unmask_irq,
 	.flags = IRQCHIP_MASK_ON_SUSPEND |
 		 IRQCHIP_SKIP_SET_WAKE,
-#ifdef CONFIG_ARM64
+#if defined(CONFIG_SMP)
 	.irq_ack    = armctrl_ack_irq
 #endif
 };
--- a/drivers/irqchip/irq-bcm2836.c
+++ b/drivers/irqchip/irq-bcm2836.c
@@ -89,7 +89,7 @@ static void bcm2836_arm_irqchip_unmask_g
 {
 }
 
-#ifdef CONFIG_ARM64
+#if defined(CONFIG_SMP)
 
 void bcm2836_arm_irqchip_spin_gpu_irq(void)
 {
