diff options
| author | Markus Pargmann <mpa@pengutronix.de> | 2013-10-17 09:18:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-04 11:05:04 -0800 |
| commit | 177636e55f3e57fcbb49e7e44c29ddbcf69e656a (patch) | |
| tree | 3fb72a44cdd1772e35fdbf5282558028f208cb38 | |
| parent | 5e4b3de253c94f6d2efda3274f5fe7bd4a0c0de9 (diff) | |
| download | linux-stable-177636e55f3e57fcbb49e7e44c29ddbcf69e656a.tar.gz linux-stable-177636e55f3e57fcbb49e7e44c29ddbcf69e656a.tar.bz2 linux-stable-177636e55f3e57fcbb49e7e44c29ddbcf69e656a.zip | |
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 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); |