diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2012-05-05 09:19:13 +0200 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2012-05-10 15:34:01 -0400 |
commit | cd3ef0bf0c03e4e5fdfcea12d8798571012858ae (patch) | |
tree | e01a0152d74042cdb56c5a62b950fb123903f6cf /recipes-kernel/linux | |
parent | 8f53db29b99e79f3e0e82bfc75a0a58741c9145b (diff) | |
download | meta-ti-cd3ef0bf0c03e4e5fdfcea12d8798571012858ae.tar.gz |
linux-ti335x-psp 3.2: use proper irq fix from Vaibhav
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-kernel/linux')
3 files changed, 2 insertions, 58 deletions
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 index 2007b5b1..00000000 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0031-omap2-irq-process-all-4-irq-banks-for-am335x.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From d5f1df216fb51e1edc3e18b6b4c6d382141cf8dd Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Wed, 2 May 2012 13:51:57 +0200 | ||
4 | Subject: [PATCH 31/32] omap2+ irq: process all 4 irq banks for am335x | ||
5 | |||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
7 | --- | ||
8 | arch/arm/mach-omap2/irq.c | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c | ||
12 | index 1fef061..419b1a1 100644 | ||
13 | --- a/arch/arm/mach-omap2/irq.c | ||
14 | +++ b/arch/arm/mach-omap2/irq.c | ||
15 | @@ -212,7 +212,7 @@ static inline void omap_intc_handle_irq(void __iomem *base_addr, struct pt_regs | ||
16 | goto out; | ||
17 | |||
18 | irqnr = readl_relaxed(base_addr + 0xd8); | ||
19 | -#ifdef CONFIG_SOC_OMAPTI816X | ||
20 | +#if defined(CONFIG_SOC_OMAPTI816X) || defined(CONFIG_SOC_OMAPAM33XX) | ||
21 | if (irqnr) | ||
22 | goto out; | ||
23 | irqnr = readl_relaxed(base_addr + 0xf8); | ||
24 | -- | ||
25 | 1.7.9.5 | ||
26 | |||
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 index beb63f3e..00000000 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0032-omap2-irqs.h-increase-number-or-irq-banks.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From c551ce3e274195934304b16cc109204a987c4295 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Wed, 2 May 2012 13:56:12 +0200 | ||
4 | Subject: [PATCH 32/32] omap2+ irqs.h: increase number or irq banks | ||
5 | |||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
7 | --- | ||
8 | arch/arm/plat-omap/include/plat/irqs.h | 4 ++-- | ||
9 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
10 | |||
11 | diff --git a/arch/arm/plat-omap/include/plat/irqs.h b/arch/arm/plat-omap/include/plat/irqs.h | ||
12 | index ce6a73c..cc15272 100644 | ||
13 | --- a/arch/arm/plat-omap/include/plat/irqs.h | ||
14 | +++ b/arch/arm/plat-omap/include/plat/irqs.h | ||
15 | @@ -434,8 +434,8 @@ | ||
16 | |||
17 | #define OMAP_IRQ_BIT(irq) (1 << ((irq) % 32)) | ||
18 | |||
19 | -#define INTCPS_NR_MIR_REGS 3 | ||
20 | -#define INTCPS_NR_IRQS 96 | ||
21 | +#define INTCPS_NR_MIR_REGS 4 | ||
22 | +#define INTCPS_NR_IRQS 128 | ||
23 | |||
24 | #include <mach/hardware.h> | ||
25 | |||
26 | -- | ||
27 | 1.7.9.5 | ||
28 | |||
diff --git a/recipes-kernel/linux/linux-ti33x-psp_3.2.bb b/recipes-kernel/linux/linux-ti33x-psp_3.2.bb index 954e5cad..2e75cc28 100644 --- a/recipes-kernel/linux/linux-ti33x-psp_3.2.bb +++ b/recipes-kernel/linux/linux-ti33x-psp_3.2.bb | |||
@@ -11,8 +11,8 @@ S = "${WORKDIR}/git" | |||
11 | MULTI_CONFIG_BASE_SUFFIX = "" | 11 | MULTI_CONFIG_BASE_SUFFIX = "" |
12 | 12 | ||
13 | BRANCH = "v3.2-staging" | 13 | BRANCH = "v3.2-staging" |
14 | SRCREV = "0d0567b6c1a61a374120b985559768077c511a6d" | 14 | SRCREV = "31944a82681a0e7ab6cc3e069c30eddc5042e3e8" |
15 | MACHINE_KERNEL_PR_append = "c+gitr${SRCREV}" | 15 | MACHINE_KERNEL_PR_append = "d+gitr${SRCREV}" |
16 | 16 | ||
17 | COMPATIBLE_MACHINE = "(ti33x)" | 17 | COMPATIBLE_MACHINE = "(ti33x)" |
18 | 18 | ||
@@ -954,8 +954,6 @@ PATCHES_OVER_PSP = " \ | |||
954 | file://beaglebone/0028-beaglebone-fix-ehrpwm-backlight.patch \ | 954 | file://beaglebone/0028-beaglebone-fix-ehrpwm-backlight.patch \ |
955 | file://beaglebone/0029-beaglebone-also-report-cape-revision.patch \ | 955 | file://beaglebone/0029-beaglebone-also-report-cape-revision.patch \ |
956 | file://beaglebone/0030-beaglebone-don-t-compare-undefined-characters-it-mak.patch \ | 956 | file://beaglebone/0030-beaglebone-don-t-compare-undefined-characters-it-mak.patch \ |
957 | file://beaglebone/0031-omap2-irq-process-all-4-irq-banks-for-am335x.patch \ | ||
958 | file://beaglebone/0032-omap2-irqs.h-increase-number-or-irq-banks.patch \ | ||
959 | file://beaglebone/0033-beaglebone-fix-3.5-cape-support.patch \ | 957 | file://beaglebone/0033-beaglebone-fix-3.5-cape-support.patch \ |
960 | file://beaglebone/0034-beaglebone-connect-batterycape-GPIO-to-gpio-charger.patch \ | 958 | file://beaglebone/0034-beaglebone-connect-batterycape-GPIO-to-gpio-charger.patch \ |
961 | file://beaglebone/0035-beaglebone-add-support-for-CAN-and-RS232-cape.patch \ | 959 | file://beaglebone/0035-beaglebone-add-support-for-CAN-and-RS232-cape.patch \ |