Commit a8e76509 authored by Eric Anholt's avatar Eric Anholt

Merge remote-tracking branch 'irqchip/irqchip/bcm' into bcm2835-arm64-next

Bring in the build fix for arm64 before we add BCM2835 arm64 to
Kconfig/Makefiles.
parents 1a9a0536 d7e3528e
...@@ -52,7 +52,6 @@ ...@@ -52,7 +52,6 @@
#include <linux/irqdomain.h> #include <linux/irqdomain.h>
#include <asm/exception.h> #include <asm/exception.h>
#include <asm/mach/irq.h>
/* Put the bank and irq (32 bits) into the hwirq */ /* Put the bank and irq (32 bits) into the hwirq */
#define MAKE_HWIRQ(b, n) ((b << 5) | (n)) #define MAKE_HWIRQ(b, n) ((b << 5) | (n))
...@@ -242,7 +241,7 @@ static void __exception_irq_entry bcm2835_handle_irq( ...@@ -242,7 +241,7 @@ static void __exception_irq_entry bcm2835_handle_irq(
u32 hwirq; u32 hwirq;
while ((hwirq = get_next_armctrl_hwirq()) != ~0) 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) static void bcm2836_chained_handle_irq(struct irq_desc *desc)
......
...@@ -180,7 +180,7 @@ __exception_irq_entry bcm2836_arm_irqchip_handle_irq(struct pt_regs *regs) ...@@ -180,7 +180,7 @@ __exception_irq_entry bcm2836_arm_irqchip_handle_irq(struct pt_regs *regs)
} else if (stat) { } else if (stat) {
u32 hwirq = ffs(stat) - 1; u32 hwirq = ffs(stat) - 1;
handle_IRQ(irq_linear_revmap(intc.domain, hwirq), regs); handle_domain_irq(intc.domain, hwirq, regs);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment