target/linux/brcm63xx/patches-3.18/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch

   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
   6 Signed-off-by: Jonas Gorski <jogo@openwrt.org>
   7 ---
   8  arch/mips/bcm63xx/irq.c |   12 +++++++++++-
   9  1 file changed, 11 insertions(+), 1 deletion(-)
  10
  11 --- a/arch/mips/bcm63xx/irq.c
  12 +++ b/arch/mips/bcm63xx/irq.c
  13 @@ -15,6 +15,8 @@
  14  #include <linux/irqchip.h>
  15  #include <linux/irqchip/irq-bcm6345-ext.h>
  16  #include <linux/irqchip/irq-bcm6345-periph.h>
  17 +#include <linux/of.h>
  18 +#include <linux/of_fdt.h>
  19  #include <asm/irq_cpu.h>
  20  #include <asm/mipsregs.h>
  21  #include <bcm63xx_cpu.h>
  22 @@ -190,7 +192,15 @@ static void bcm63xx_init_irq(void)
  23                                       ext_shift);
  24  }
  25
  26 +OF_DECLARE_2(irqchip, mips_cpu_intc, "mti,cpu-interrupt-controller",
  27 +            mips_cpu_irq_of_init);
  28 +
  29  void __init arch_init_irq(void)
  30  {
  31 -       bcm63xx_init_irq();
  32 +#ifdef CONFIG_OF
  33 +       if (initial_boot_params)
  34 +               irqchip_init();
  35 +       else
  36 +#endif
  37 +               bcm63xx_init_irq();
  38  }