target/linux/brcm63xx/patches-4.14/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, 12 insertions(+)
  10
  11 --- a/arch/mips/bcm63xx/irq.c
  12 +++ b/arch/mips/bcm63xx/irq.c
  13 @@ -14,6 +14,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 @@ -21,6 +23,9 @@
  23  #include <bcm63xx_io.h>
  24  #include <bcm63xx_irq.h>
  25
  26 +IRQCHIP_DECLARE(mips_cpu_intc, "mti,cpu-interrupt-controller",
  27 +            mips_cpu_irq_of_init);
  28 +
  29  void __init arch_init_irq(void)
  30  {
  31         void __iomem *periph_bases[2];
  32 @@ -29,6 +34,13 @@ void __init arch_init_irq(void)
  33         int periph_irqs[2] = { 2, 3 };
  34         int ext_irqs[6];
  35
  36 +#ifdef CONFIG_OF
  37 +       if (initial_boot_params) {
  38 +               irqchip_init();
  39 +               return;
  40 +       }
  41 +#endif
  42 +
  43         periph_bases[0] = (void __iomem *)bcm63xx_regset_address(RSET_PERF);
  44         periph_bases[1] = (void __iomem *)bcm63xx_regset_address(RSET_PERF);
  45         ext_intc_bases[0] = (void __iomem *)bcm63xx_regset_address(RSET_PERF);