* [PATCH] ARM: omap2: irq, AM33XX add missing register check
@ 2013-10-17 7:18 Markus Pargmann
2013-10-22 14:55 ` Tony Lindgren
0 siblings, 1 reply; 2+ messages in thread
From: Markus Pargmann @ 2013-10-17 7:18 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
arch/arm/mach-omap2/irq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
index 3926f37..e022a86 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);
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] ARM: omap2: irq, AM33XX add missing register check
2013-10-17 7:18 [PATCH] ARM: omap2: irq, AM33XX add missing register check Markus Pargmann
@ 2013-10-22 14:55 ` Tony Lindgren
0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2013-10-22 14:55 UTC (permalink / raw)
To: linux-arm-kernel
* Markus Pargmann <mpa@pengutronix.de> [131017 00:19]:
> 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>
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
> ---
> arch/arm/mach-omap2/irq.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
> index 3926f37..e022a86 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);
> --
> 1.8.4.rc3
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-10-22 14:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-17 7:18 [PATCH] ARM: omap2: irq, AM33XX add missing register check Markus Pargmann
2013-10-22 14:55 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).