diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2013-11-15 12:23:17 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2013-11-15 12:23:17 +0000 |
| commit | e4eef7e6207078a4987b0e02d2ad4068083cf921 (patch) | |
| tree | ae97c3d14f8a010428d78dfc27dde471ad897232 /target/linux/omap/patches-3.12/800-ARM_OMAP2plus_irq_AM33XX_add_missing_register_check.patch | |
| parent | 1f3478901593dd3bb4f32b2cdcb4c4cfecdbea5a (diff) | |
| download | mtk-20170518-e4eef7e6207078a4987b0e02d2ad4068083cf921.zip mtk-20170518-e4eef7e6207078a4987b0e02d2ad4068083cf921.tar.gz mtk-20170518-e4eef7e6207078a4987b0e02d2ad4068083cf921.tar.bz2 | |
replace the TI patch with a smaller patchset
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 38816
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 | 28 |
1 files changed, 28 insertions, 0 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 new file mode 100644 index 0000000..a6c80a2 --- /dev/null +++ b/target/linux/omap/patches-3.12/800-ARM_OMAP2plus_irq_AM33XX_add_missing_register_check.patch @@ -0,0 +1,28 @@ +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> +--- +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); +-- +cgit v0.9.2 |