summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMarc Zyngier <maz@kernel.org>2019-07-31 19:28:49 +0300
committerMarc Zyngier <maz@kernel.org>2019-08-20 12:23:35 +0300
commit25edaed6c7feca8fded25348732c628283304364 (patch)
tree80829ff42bd16dc5b0dd2cd414bee75d5af99d96 /drivers
parentad5a78d3da81836c88d1f2d53310484462660997 (diff)
downloadlinux-25edaed6c7feca8fded25348732c628283304364.tar.xz
irqchip/gic: Skip DT quirks when evaluating IIDR-based quirks
When evaluating potential quirks matched by reads of the IIDR register, skip the quirk entries that use a "compatible" property attached to them, as these are DT based. Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/irqchip/irq-gic-common.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/irqchip/irq-gic-common.c b/drivers/irqchip/irq-gic-common.c
index 14110db01c05..82520006195d 100644
--- a/drivers/irqchip/irq-gic-common.c
+++ b/drivers/irqchip/irq-gic-common.c
@@ -41,6 +41,8 @@ void gic_enable_quirks(u32 iidr, const struct gic_quirk *quirks,
void *data)
{
for (; quirks->desc; quirks++) {
+ if (quirks->compatible)
+ continue;
if (quirks->iidr != (quirks->mask & iidr))
continue;
if (quirks->init(data))