[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1464728727-16300-1-git-send-email-eric@anholt.net>
Date: Tue, 31 May 2016 14:05:27 -0700
From: Eric Anholt <eric@...olt.net>
To: Thomas Gleixner <tglx@...utronix.de>
Cc: linux-rpi-kernel@...ts.infradead.org,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
Stephen Warren <swarren@...dotorg.org>,
Lee Jones <lee@...nel.org>,
Jason Cooper <jason@...edaemon.net>,
Marc Zyngier <marc.zyngier@....com>,
Eric Anholt <eric@...olt.net>
Subject: [PATCH v2 RESEND] irqchip: bcm2835: Avoid arch/arm-specific handle_IRQ
This is equivalent and works for arm64 as well.
Signed-off-by: Eric Anholt <eric@...olt.net>
Acked-by: Stephen Warren <swarren@...dotorg.org>
---
Patch 1 of the arm64 series was left out of the 4.7 pull request.
Would it be possible to merge this through the SOC tree? Otherwise I
would need a stable branch to merge from you, so that I can land the
Makefile changes to start building it.
drivers/irqchip/irq-bcm2835.c | 3 +--
drivers/irqchip/irq-bcm2836.c | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c
index bf9cc5f2e839..44d7c38dde47 100644
--- a/drivers/irqchip/irq-bcm2835.c
+++ b/drivers/irqchip/irq-bcm2835.c
@@ -52,7 +52,6 @@
#include <linux/irqdomain.h>
#include <asm/exception.h>
-#include <asm/mach/irq.h>
/* Put the bank and irq (32 bits) into the hwirq */
#define MAKE_HWIRQ(b, n) ((b << 5) | (n))
@@ -242,7 +241,7 @@ static void __exception_irq_entry bcm2835_handle_irq(
u32 hwirq;
while ((hwirq = get_next_armctrl_hwirq()) != ~0)
- handle_IRQ(irq_linear_revmap(intc.domain, hwirq), regs);
+ handle_domain_irq(intc.domain, hwirq, regs);
}
static void bcm2836_chained_handle_irq(struct irq_desc *desc)
diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c
index 72ff1d5c5de6..27875982657e 100644
--- a/drivers/irqchip/irq-bcm2836.c
+++ b/drivers/irqchip/irq-bcm2836.c
@@ -180,7 +180,7 @@ __exception_irq_entry bcm2836_arm_irqchip_handle_irq(struct pt_regs *regs)
} else if (stat) {
u32 hwirq = ffs(stat) - 1;
- handle_IRQ(irq_linear_revmap(intc.domain, hwirq), regs);
+ handle_domain_irq(intc.domain, hwirq, regs);
}
}
--
2.8.0.rc3
Powered by blists - more mailing lists