373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch 1.0 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. From 8a0803979163c647736cb234ee1620c049c4915c Mon Sep 17 00:00:00 2001
  2. From: Jonas Gorski <jogo@openwrt.org>
  3. Date: Mon, 1 Dec 2014 00:20:07 +0100
  4. Subject: [PATCH 5/5] MIPS: BCM63XX: register interrupt controllers through DT
  5. Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  6. ---
  7. arch/mips/bcm63xx/irq.c | 12 +++++++++++-
  8. 1 file changed, 11 insertions(+), 1 deletion(-)
  9. --- a/arch/mips/bcm63xx/irq.c
  10. +++ b/arch/mips/bcm63xx/irq.c
  11. @@ -15,6 +15,8 @@
  12. #include <linux/irqchip.h>
  13. #include <linux/irqchip/irq-bcm6345-ext.h>
  14. #include <linux/irqchip/irq-bcm6345-periph.h>
  15. +#include <linux/of.h>
  16. +#include <linux/of_fdt.h>
  17. #include <asm/irq_cpu.h>
  18. #include <asm/mipsregs.h>
  19. #include <bcm63xx_cpu.h>
  20. @@ -190,7 +192,15 @@ static void bcm63xx_init_irq(void)
  21. ext_shift);
  22. }
  23. +OF_DECLARE_2(irqchip, mips_cpu_intc, "mti,cpu-interrupt-controller",
  24. + mips_cpu_irq_of_init);
  25. +
  26. void __init arch_init_irq(void)
  27. {
  28. - bcm63xx_init_irq();
  29. +#ifdef CONFIG_OF
  30. + if (initial_boot_params)
  31. + irqchip_init();
  32. + else
  33. +#endif
  34. + bcm63xx_init_irq();
  35. }