drivers: irq-bcm283x: swizzle interrupts on ARMv7 too

P33M · popcornmix · commit 9ae6f3ada097 · 2025-07-24T11:19:00.000+01:00
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 &lt;jonathan@raspberrypi.com&gt;
diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c
@@ -153,7 +153,8 @@ static void armctrl_unmask_irq(struct irq_data *d)
 	}
 }
 
-#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
 };
diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c
@@ -89,7 +89,7 @@ static void bcm2836_arm_irqchip_unmask_gpu_irq(struct irq_data *d)
 {
 }
 
-#ifdef CONFIG_ARM64
+#if defined(CONFIG_SMP)
 
 void bcm2836_arm_irqchip_spin_gpu_irq(void)
 {

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,8 @@ static void armctrl_unmask_irq(struct irq_data *d)`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`
`156`		`-#ifdef CONFIG_ARM64`
	`156`	`+#if defined(CONFIG_SMP)`
	`157`	`+void bcm2836_arm_irqchip_spin_gpu_irq(void);`
`157`	`158`
`158`	`159`	`static void armctrl_ack_irq(struct irq_data *d)`
`159`	`160`	`{`
`@@ -168,7 +169,7 @@ static struct irq_chip armctrl_chip = {`
`168`	`169`	`.irq_unmask = armctrl_unmask_irq,`
`169`	`170`	`.flags = IRQCHIP_MASK_ON_SUSPEND \|`
`170`	`171`	`IRQCHIP_SKIP_SET_WAKE,`
`171`		`-#ifdef CONFIG_ARM64`
	`172`	`+#if defined(CONFIG_SMP)`
`172`	`173`	`.irq_ack = armctrl_ack_irq`
`173`	`174`	`#endif`
`174`	`175`	`};`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ static void bcm2836_arm_irqchip_unmask_gpu_irq(struct irq_data *d)`
`89`	`89`	`{`
`90`	`90`	`}`
`91`	`91`
`92`		`-#ifdef CONFIG_ARM64`
	`92`	`+#if defined(CONFIG_SMP)`
`93`	`93`
`94`	`94`	`void bcm2836_arm_irqchip_spin_gpu_irq(void)`
`95`	`95`	`{`