Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8e76509 authored by Eric Anholt's avatar Eric Anholt
Browse files

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

drivers/irqchip/irq-bcm2835.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

drivers/irqchip/irq-bcm2836.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}

}