diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2013-12-14 17:37:14 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2013-12-14 17:37:14 +0000 |
| commit | e504547e4c80f2a2963b69d1cfc7cd046f6253e6 (patch) | |
| tree | a3206aa892ebe4f89781ca8a824aba978faebbee /target/linux/omap/patches-3.12/800-ARM_OMAP2plus_irq_AM33XX_add_missing_register_check.patch | |
| parent | a55649082a4cc02e85d3292a4077548c180c92dd (diff) | |
| download | master-31e0f0ae-e504547e4c80f2a2963b69d1cfc7cd046f6253e6.tar.gz master-31e0f0ae-e504547e4c80f2a2963b69d1cfc7cd046f6253e6.tar.bz2 master-31e0f0ae-e504547e4c80f2a2963b69d1cfc7cd046f6253e6.zip | |
upgrade 3.12 targets to 3.12.5
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 39055
Diffstat (limited to 'target/linux/omap/patches-3.12/800-ARM_OMAP2plus_irq_AM33XX_add_missing_register_check.patch')
| -rw-r--r-- | target/linux/omap/patches-3.12/800-ARM_OMAP2plus_irq_AM33XX_add_missing_register_check.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/target/linux/omap/patches-3.12/800-ARM_OMAP2plus_irq_AM33XX_add_missing_register_check.patch b/target/linux/omap/patches-3.12/800-ARM_OMAP2plus_irq_AM33XX_add_missing_register_check.patch deleted file mode 100644 index ca92faa784..0000000000 --- a/target/linux/omap/patches-3.12/800-ARM_OMAP2plus_irq_AM33XX_add_missing_register_check.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0bebda684857f76548ea48c8886785198701d8d3 Mon Sep 17 00:00:00 2001 -From: Markus Pargmann <mpa@pengutronix.de> -Date: Thu, 17 Oct 2013 07:18:38 +0000 -Subject: 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. - -Cc: stable@vger.kernel.org -Signed-off-by: Markus Pargmann <mpa@pengutronix.de> -Signed-off-by: Tony Lindgren <tony@atomide.com> ---- ---- 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( - 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); |