c9ae111a20
This is a backport of the patches accepted to the Linux mainline related to mvebu SoC (Armada XP and Armada 370) between Linux v3.12, and Linux v3.13. This work mainly covers: * Finishes work for sharing the pxa nand driver(drivers/mtd/nand/pxa3xx_nand.c) between the PXA family, and the Armada family. * timer initialization update, and access function for the Armada family. * Generic IRQ handling backporting. * Some bug fixes. Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com> CC: Luka Perkov <luka@openwrt.org> SVN-Revision: 39566
26 lines
947 B
Diff
26 lines
947 B
Diff
From 8413f9010508998c62969827850a7434a1d5716c Mon Sep 17 00:00:00 2001
|
|
From: Tomasz Figa <t.figa@samsung.com>
|
|
Date: Thu, 19 Dec 2013 09:31:03 -0300
|
|
Subject: [PATCH 192/203] of: irq: Fix interrupt-map entry matching
|
|
|
|
This patch fixes interrupt-map entry matching code to properly match all
|
|
specifier cells with interrupt map entries.
|
|
|
|
Signed-off-by: Tomasz Figa <t.figa@samsung.com>
|
|
Tested-by: Sachin Kamat <sachin.kamat@linaro.org>
|
|
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
|
|
---
|
|
drivers/of/irq.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/of/irq.c
|
|
+++ b/drivers/of/irq.c
|
|
@@ -199,7 +199,7 @@ int of_irq_parse_raw(const __be32 *addr,
|
|
/* Compare specifiers */
|
|
match = 1;
|
|
for (i = 0; i < (addrsize + intsize); i++, imaplen--)
|
|
- match = !((match_array[i] ^ *imap++) & imask[i]);
|
|
+ match &= !((match_array[i] ^ *imap++) & imask[i]);
|
|
|
|
pr_debug(" -> match=%d (imaplen=%d)\n", match, imaplen);
|
|
|