ath9k: merge another round of cleanups and fixes submitted to linux-wireless
[openwrt/svn-archive/archive.git] / target / linux / omap / patches-3.12 / 800-ARM_OMAP2plus_irq_AM33XX_add_missing_register_check.patch
1 From 0bebda684857f76548ea48c8886785198701d8d3 Mon Sep 17 00:00:00 2001
2 From: Markus Pargmann <mpa@pengutronix.de>
3 Date: Thu, 17 Oct 2013 07:18:38 +0000
4 Subject: ARM: OMAP2+: irq, AM33XX add missing register check
5
6 am33xx has a INTC_PENDING_IRQ3 register that is not checked for pending
7 interrupts. This patch adds AM33XX to the ifdef of SOCs that have to
8 check this register.
9
10 Cc: stable@vger.kernel.org
11 Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
12 Signed-off-by: Tony Lindgren <tony@atomide.com>
13 ---
14 --- a/arch/arm/mach-omap2/irq.c
15 +++ b/arch/arm/mach-omap2/irq.c
16 @@ -233,7 +233,7 @@ static inline void omap_intc_handle_irq(
17 goto out;
18
19 irqnr = readl_relaxed(base_addr + 0xd8);
20 -#ifdef CONFIG_SOC_TI81XX
21 +#if IS_ENABLED(CONFIG_SOC_TI81XX) || IS_ENABLED(CONFIG_SOC_AM33XX)
22 if (irqnr)
23 goto out;
24 irqnr = readl_relaxed(base_addr + 0xf8);