diff options
| author | Markus Pargmann <mpa@pengutronix.de> | 2013-10-17 03:18:38 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-04 13:55:46 -0500 |
| commit | 6ca235a5703b6d30df5d4c8d47d6f8d6695d46fd (patch) | |
| tree | 8d60d7413663742863b78dee896c02e4c4d28c65 | |
| parent | c44d83ec7018dd23255c23897492b3c8d43785df (diff) | |
ARM: OMAP2+: irq, AM33XX add missing register check
commit 0bebda684857f76548ea48c8886785198701d8d3 upstream.
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.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/arm/mach-omap2/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index 3926f370448f..e022a869bff2 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c | |||
| @@ -233,7 +233,7 @@ static inline void omap_intc_handle_irq(void __iomem *base_addr, struct pt_regs | |||
| 233 | goto out; | 233 | goto out; |
| 234 | 234 | ||
| 235 | irqnr = readl_relaxed(base_addr + 0xd8); | 235 | irqnr = readl_relaxed(base_addr + 0xd8); |
| 236 | #ifdef CONFIG_SOC_TI81XX | 236 | #if IS_ENABLED(CONFIG_SOC_TI81XX) || IS_ENABLED(CONFIG_SOC_AM33XX) |
| 237 | if (irqnr) | 237 | if (irqnr) |
| 238 | goto out; | 238 | goto out; |
| 239 | irqnr = readl_relaxed(base_addr + 0xf8); | 239 | irqnr = readl_relaxed(base_addr + 0xf8); |