linux-ti335x-psp 3.2: use proper irq fix from Vaibhav
authorKoen Kooi <koen@dominion.thruhere.net>
Sat, 5 May 2012 07:19:13 +0000 (09:19 +0200)
committerDenys Dmytriyenko <denys@ti.com>
Thu, 10 May 2012 19:34:01 +0000 (15:34 -0400)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0031-omap2-irq-process-all-4-irq-banks-for-am335x.patch [deleted file]
recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0032-omap2-irqs.h-increase-number-or-irq-banks.patch [deleted file]
recipes-kernel/linux/linux-ti33x-psp_3.2.bb

diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0031-omap2-irq-process-all-4-irq-banks-for-am335x.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0031-omap2-irq-process-all-4-irq-banks-for-am335x.patch
deleted file mode 100644 (file)
index 2007b5b..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From d5f1df216fb51e1edc3e18b6b4c6d382141cf8dd Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Wed, 2 May 2012 13:51:57 +0200
-Subject: [PATCH 31/32] omap2+ irq: process all 4 irq banks for am335x
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- 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 1fef061..419b1a1 100644
---- a/arch/arm/mach-omap2/irq.c
-+++ b/arch/arm/mach-omap2/irq.c
-@@ -212,7 +212,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_OMAPTI816X
-+#if defined(CONFIG_SOC_OMAPTI816X) || defined(CONFIG_SOC_OMAPAM33XX)
-               if (irqnr)
-                       goto out;
-               irqnr = readl_relaxed(base_addr + 0xf8);
--- 
-1.7.9.5
-
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0032-omap2-irqs.h-increase-number-or-irq-banks.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0032-omap2-irqs.h-increase-number-or-irq-banks.patch
deleted file mode 100644 (file)
index beb63f3..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From c551ce3e274195934304b16cc109204a987c4295 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Wed, 2 May 2012 13:56:12 +0200
-Subject: [PATCH 32/32] omap2+ irqs.h: increase number or irq banks
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- arch/arm/plat-omap/include/plat/irqs.h |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/plat-omap/include/plat/irqs.h b/arch/arm/plat-omap/include/plat/irqs.h
-index ce6a73c..cc15272 100644
---- a/arch/arm/plat-omap/include/plat/irqs.h
-+++ b/arch/arm/plat-omap/include/plat/irqs.h
-@@ -434,8 +434,8 @@
- #define OMAP_IRQ_BIT(irq)     (1 << ((irq) % 32))
--#define INTCPS_NR_MIR_REGS    3
--#define INTCPS_NR_IRQS                96
-+#define INTCPS_NR_MIR_REGS    4
-+#define INTCPS_NR_IRQS                128
- #include <mach/hardware.h>
--- 
-1.7.9.5
-
index 954e5cadcc59c4c100235f959af20cc1a27967aa..2e75cc2819943443aa2aa6bcfb488bc3d816d421 100644 (file)
@@ -11,8 +11,8 @@ S = "${WORKDIR}/git"
 MULTI_CONFIG_BASE_SUFFIX = ""
 
 BRANCH = "v3.2-staging"
-SRCREV = "0d0567b6c1a61a374120b985559768077c511a6d"
-MACHINE_KERNEL_PR_append = "c+gitr${SRCREV}"
+SRCREV = "31944a82681a0e7ab6cc3e069c30eddc5042e3e8"
+MACHINE_KERNEL_PR_append = "d+gitr${SRCREV}"
 
 COMPATIBLE_MACHINE = "(ti33x)"
 
@@ -954,8 +954,6 @@ PATCHES_OVER_PSP = " \
        file://beaglebone/0028-beaglebone-fix-ehrpwm-backlight.patch \
        file://beaglebone/0029-beaglebone-also-report-cape-revision.patch \
        file://beaglebone/0030-beaglebone-don-t-compare-undefined-characters-it-mak.patch \
-       file://beaglebone/0031-omap2-irq-process-all-4-irq-banks-for-am335x.patch \
-       file://beaglebone/0032-omap2-irqs.h-increase-number-or-irq-banks.patch \
        file://beaglebone/0033-beaglebone-fix-3.5-cape-support.patch \
        file://beaglebone/0034-beaglebone-connect-batterycape-GPIO-to-gpio-charger.patch \
        file://beaglebone/0035-beaglebone-add-support-for-CAN-and-RS232-cape.patch \