Skip to contentSkip to conversation

ARM: omap2: irq, AM33XX add missing register check

PATCH New Markus Pargmann 2 participants 2 messages Oct 17, 2013 – Oct 22, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: omap2: irq, AM33XX add missing register check

am33xx has a INTC_PENDING_IRQ3 register that is not checked for pending interrupts. This patch adds AM33XX to the ifdef of SOCs that have to check this register.

---
 arch/arm/mach-omap2/irq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/irq.c +1 -1
index 3926f37..e022a86 100644
@@ -233,7 +233,7 @@ static inline void omap_intc_handle_irq(void __iomem *base_addr, struct pt_regs
 			goto out;
 
 		irqnr = readl_relaxed(base_addr + 0xd8);
-#ifdef CONFIG_SOC_TI81XX
+#if IS_ENABLED(CONFIG_SOC_TI81XX) || IS_ENABLED(CONFIG_SOC_AM33XX)
 		if (irqnr)
 			goto out;
 		irqnr = readl_relaxed(base_addr + 0xf8);
Signature · 1 line
1.8.4.rc3
maintainer
#1 lore raw

PATCH 1/1 ARM: omap2: irq, AM33XX add missing register check

Quoted 5 lines · Markus Pargmann

am33xx has a INTC_PENDING_IRQ3 register that is not checked for pending interrupts. This patch adds AM33XX to the ifdef of SOCs that have to check this register.

Thanks, it seems this can wait for the merge window, but I'll also add cc stable to it as it can save some duplicate debugging for people.

So I'll apply this into omap-for-v3.13/fixes-not-urgent.

Regards,

Tony

Quoted 20 lines
---
 arch/arm/mach-omap2/irq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/irq.c +1 -1
index 3926f37..e022a86 100644
@@ -233,7 +233,7 @@ static inline void omap_intc_handle_irq(void __iomem *base_addr, struct pt_regs
 			goto out;
 
 		irqnr = readl_relaxed(base_addr + 0xd8);
-#ifdef CONFIG_SOC_TI81XX
+#if IS_ENABLED(CONFIG_SOC_TI81XX) || IS_ENABLED(CONFIG_SOC_AM33XX)
 		if (irqnr)
 			goto out;
 		irqnr = readl_relaxed(base_addr + 0xf8);
Signature · 1 line
1.8.4.rc3