brcm63xx: register interrupt-controllers through DT when possible

Add the required nodes for the interrupt controllers and register
them through DT when a DTB is present.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 43457

diff --git a/target/linux/brcm63xx/dts/bcm6318.dtsi b/target/linux/brcm63xx/dts/bcm6318.dtsi
index 370183e81c307014f11ac863742fc9be480afeb7..723c488f20c4e944bd1cdde43d85b084eae37ba0 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm6318.dtsi
+++ b/target/linux/brcm63xx/dts/bcm6318.dtsi
@@ -14,6 +14,14 @@
                };
        };
 
                };
        };
 

+       cpu_intc: interrupt-controller {
+               #address-cells = <0>;
+               compatible = "mti,cpu-interrupt-controller";
+
+               interrupt-controller;
+               #interrupt-cells = <1>;
+       };
+

        memory { device_type = "memory"; reg = <0 0>; };
 
        ubus@10000000 {
        memory { device_type = "memory"; reg = <0 0>; };
 
        ubus@10000000 {


@@ -21,5 +29,27 @@
                #size-cells = <1>;
                ranges;
                compatible = "simple-bus";
                #size-cells = <1>;
                ranges;
                compatible = "simple-bus";

+
+               ext_intc: interrupt-controller@10000018 {
+                       compatible = "brcm,bcm6345-ext-intc";
+                       reg = <0x10000018 0x4>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+
+                       interrupt-parent = <&periph_intc>;
+                       interrupts = <24>, <25>, <26>, <27>;
+               };
+
+               periph_intc: interrupt-controller@10000020 {
+                       compatible = "brcm,bcm6345-l2-intc";
+                       reg = <0x10000020 0x20>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <1>;
+
+                       interrupt-parent = <&cpu_intc>;
+                       interrupts = <2>;
+               };

        };
 };
        };
 };

diff --git a/target/linux/brcm63xx/dts/bcm63268.dtsi b/target/linux/brcm63xx/dts/bcm63268.dtsi
index eafa74b6acef3d6218847001d3b2940efaaba341..214cd6266c369701bbe1f95ea7f53019204bb2bd 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm63268.dtsi
+++ b/target/linux/brcm63xx/dts/bcm63268.dtsi
@@ -20,6 +20,14 @@
                };
        };
 
                };
        };
 

+       cpu_intc: interrupt-controller {
+               #address-cells = <0>;
+               compatible = "mti,cpu-interrupt-controller";
+
+               interrupt-controller;
+               #interrupt-cells = <1>;
+       };
+

        memory { device_type = "memory"; reg = <0 0>; };
 
        ubus@10000000 {
        memory { device_type = "memory"; reg = <0 0>; };
 
        ubus@10000000 {


@@ -27,5 +35,28 @@
                #size-cells = <1>;
                ranges;
                compatible = "simple-bus";
                #size-cells = <1>;
                ranges;
                compatible = "simple-bus";

+
+               ext_intc: interrupt-controller@10000018 {
+                       compatible = "brcm,bcm6345-ext-intc";
+                       reg = <0x10000018 0x4>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+
+                       interrupt-parent = <&periph_intc>;
+                       interrupts = <44>, <45>, <46>, <47>;
+               };
+
+               periph_intc: interrupt-controller@10000020 {
+                       compatible = "brcm,bcm6345-l2-intc";
+                       reg = <0x10000020 0x20>,
+                             <0x10000040 0x20>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <1>;
+
+                       interrupt-parent = <&cpu_intc>;
+                       interrupts = <2>, <3>;
+               };

        };
 };
        };
 };

diff --git a/target/linux/brcm63xx/dts/bcm6328.dtsi b/target/linux/brcm63xx/dts/bcm6328.dtsi
index c9940c16de0e53edcd2c53a814947a66dc12831e..0ed186e185c18db565f3fd8d440c89dc47675ea5 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm6328.dtsi
+++ b/target/linux/brcm63xx/dts/bcm6328.dtsi
@@ -14,6 +14,14 @@
                };
        };
 
                };
        };
 

+       cpu_intc: interrupt-controller {
+               #address-cells = <0>;
+               compatible = "mti,cpu-interrupt-controller";
+
+               interrupt-controller;
+               #interrupt-cells = <1>;
+       };
+

        memory { device_type = "memory"; reg = <0 0>; };
 
        ubus@10000000 {
        memory { device_type = "memory"; reg = <0 0>; };
 
        ubus@10000000 {


@@ -21,5 +29,27 @@
                #size-cells = <1>;
                ranges;
                compatible = "simple-bus";
                #size-cells = <1>;
                ranges;
                compatible = "simple-bus";

+
+               ext_intc: interrupt-controller@10000018 {
+                       compatible = "brcm,bcm6345-ext-intc";
+                       reg = <0x10000018 0x4>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+
+                       interrupt-parent = <&periph_intc>;
+                       interrupts = <24>, <25>, <26>, <27>;
+               };
+
+               periph_intc: interrupt-controller@10000020 {
+                       compatible = "brcm,bcm6345-l2-intc";
+                       reg = <0x10000020 0x10>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <1>;
+
+                       interrupt-parent = <&cpu_intc>;
+                       interrupts = <2>;
+               };

        };
 };
        };
 };

diff --git a/target/linux/brcm63xx/dts/bcm6338.dtsi b/target/linux/brcm63xx/dts/bcm6338.dtsi
index 9746e7a4fdbd18147f953c16aa22adc86afad7b6..b52778106038e73d299d02112c99264fc656a8c7 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm6338.dtsi
+++ b/target/linux/brcm63xx/dts/bcm6338.dtsi
@@ -18,6 +18,14 @@
                };
        };
 
                };
        };
 

+       cpu_intc: interrupt-controller {
+               #address-cells = <0>;
+               compatible = "mti,cpu-interrupt-controller";
+
+               interrupt-controller;
+               #interrupt-cells = <1>;
+       };
+

        memory { device_type = "memory"; reg = <0 0>; };
 
        pflash: nor@1fc00000 {
        memory { device_type = "memory"; reg = <0 0>; };
 
        pflash: nor@1fc00000 {


@@ -35,5 +43,27 @@
                #size-cells = <1>;
                ranges;
                compatible = "simple-bus";
                #size-cells = <1>;
                ranges;
                compatible = "simple-bus";

+
+               periph_intc: interrupt-controller@fffe000c {
+                       compatible = "brcm,bcm6345-l2-intc";
+                       reg = <0xfffe000c 0x8>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <1>;
+
+                       interrupt-parent = <&cpu_intc>;
+                       interrupts = <2>;
+               };
+
+               ext_intc: interrupt-controller@fffe0014 {
+                       compatible = "brcm,bcm6345-ext-intc";
+                       reg = <0xfffe0014 0x4>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+
+                       interrupt-parent = <&cpu_intc>;
+                       interrupts = <3>, <4>, <5>, <6>;
+               };

        };
 };
        };
 };

diff --git a/target/linux/brcm63xx/dts/bcm6345.dtsi b/target/linux/brcm63xx/dts/bcm6345.dtsi
index 03e742b7ac6b7860af7113d269885aac263e6990..16ba8bd6c028b8d44aada0fa2ea95839cdf3f295 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm6345.dtsi
+++ b/target/linux/brcm63xx/dts/bcm6345.dtsi
@@ -18,6 +18,14 @@
                };
        };
 
                };
        };
 

+       cpu_intc: interrupt-controller {
+               #address-cells = <0>;
+               compatible = "mti,cpu-interrupt-controller";
+
+               interrupt-controller;
+               #interrupt-cells = <1>;
+       };
+

        memory { device_type = "memory"; reg = <0 0>; };
 
        pflash: nor@1fc00000 {
        memory { device_type = "memory"; reg = <0 0>; };
 
        pflash: nor@1fc00000 {


@@ -35,5 +43,27 @@
                #size-cells = <1>;
                ranges;
                compatible = "simple-bus";
                #size-cells = <1>;
                ranges;
                compatible = "simple-bus";

+
+               periph_intc: interrupt-controller@fffe000c {
+                       compatible = "brcm,bcm6345-l2-intc";
+                       reg = <0xfffe000c 0x9>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <1>;
+
+                       interrupt-parent = <&cpu_intc>;
+                       interrupts = <2>;
+               };
+
+               ext_intc: interrupt-controller@fffe0014 {
+                       compatible = "brcm,bcm6345-ext-intc";
+                       reg = <0xfffe0014 0x4>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+
+                       interrupt-parent = <&cpu_intc>;
+                       interrupts = <3>, <4>, <5>, <6>;
+               };

        };
 };
        };
 };

diff --git a/target/linux/brcm63xx/dts/bcm6348.dtsi b/target/linux/brcm63xx/dts/bcm6348.dtsi
index 404ed334358cd0ebacca6800006d42c7ae4ca402..06ecbaa1f92a1a803702148f899ed9850b6c19b8 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm6348.dtsi
+++ b/target/linux/brcm63xx/dts/bcm6348.dtsi
@@ -18,6 +18,14 @@
                };
        };
 
                };
        };
 

+       cpu_intc: interrupt-controller {
+               #address-cells = <0>;
+               compatible = "mti,cpu-interrupt-controller";
+
+               interrupt-controller;
+               #interrupt-cells = <1>;
+       };
+

        memory { device_type = "memory"; reg = <0 0>; };
 
        pflash: nor@1fc00000 {
        memory { device_type = "memory"; reg = <0 0>; };
 
        pflash: nor@1fc00000 {


@@ -35,5 +43,27 @@
                #size-cells = <1>;
                ranges;
                compatible = "simple-bus";
                #size-cells = <1>;
                ranges;
                compatible = "simple-bus";

+
+               periph_intc: interrupt-controller@fffe000c {
+                       compatible = "brcm,bcm6345-l2-intc";
+                       reg = <0xfffe000c 0x8>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <1>;
+
+                       interrupt-parent = <&cpu_intc>;
+                       interrupts = <2>;
+               };
+
+               ext_intc: interrupt-controller@fffe0014 {
+                       compatible = "brcm,bcm6348-ext-intc";
+                       reg = <0xfffe0014 0x4>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+
+                       interrupt-parent = <&cpu_intc>;
+                       interrupts = <3>, <4>, <5>, <6>;
+               };

        };
 };
        };
 };

diff --git a/target/linux/brcm63xx/dts/bcm6358.dtsi b/target/linux/brcm63xx/dts/bcm6358.dtsi
index b376cf01f33fb9a793cd979a8116652005664970..a4af2144a8dcaf1ecbcc794d4b17e5f914a0a2ec 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm6358.dtsi
+++ b/target/linux/brcm63xx/dts/bcm6358.dtsi
@@ -24,6 +24,14 @@
                };
        };
 
                };
        };
 

+       cpu_intc: interrupt-controller {
+               #address-cells = <0>;
+               compatible = "mti,cpu-interrupt-controller";
+
+               interrupt-controller;
+               #interrupt-cells = <1>;
+       };
+

        memory { device_type = "memory"; reg = <0 0>; };
 
        pflash: nor@1e000000 {
        memory { device_type = "memory"; reg = <0 0>; };
 
        pflash: nor@1e000000 {


@@ -41,5 +49,39 @@
                #size-cells = <1>;
                ranges;
                compatible = "simple-bus";
                #size-cells = <1>;
                ranges;
                compatible = "simple-bus";

+
+               periph_intc: interrupt-controller@fffe000c {
+                       compatible = "brcm,bcm6345-l2-intc";
+                       reg = <0xfffe000c 0x8>,
+                             <0xfffe0038 0x8>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <1>;
+
+                       interrupt-parent = <&cpu_intc>;
+                       interrupts = <2>, <3>;
+               };
+
+               ext_intc0: interrupt-controller@fffe0014 {
+                       compatible = "brcm,bcm6345-ext-intc";
+                       reg = <0xfffe0014 0x4>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+
+                       interrupt-parent = <&periph_intc>;
+                       interrupts = <25>, <26>, <27>, <28>;
+               };
+
+               ext_intc1: interrupt-controller@fffe001c {
+                       compatible = "brcm,bcm6345-ext-intc";
+                       reg = <0xfffe001c 0x4>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+
+                       interrupt-parent = <&periph_intc>;
+                       interrupts = <20>, <21>;
+               };

        };
 };
        };
 };

diff --git a/target/linux/brcm63xx/dts/bcm6362.dtsi b/target/linux/brcm63xx/dts/bcm6362.dtsi
index 543d24ebaecd4b068b61f7cd6b2097b5d8883a2f..36765b0eba45acc6c833f5ea4993bf71b9b81a28 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm6362.dtsi
+++ b/target/linux/brcm63xx/dts/bcm6362.dtsi
@@ -20,6 +20,14 @@
                };
        };
 
                };
        };
 

+       cpu_intc: interrupt-controller {
+               #address-cells = <0>;
+               compatible = "mti,cpu-interrupt-controller";
+
+               interrupt-controller;
+               #interrupt-cells = <1>;
+       };
+

        memory { device_type = "memory"; reg = <0 0>; };
 
        ubus@10000000 {
        memory { device_type = "memory"; reg = <0 0>; };
 
        ubus@10000000 {


@@ -27,5 +35,28 @@
                #size-cells = <1>;
                ranges;
                compatible = "simple-bus";
                #size-cells = <1>;
                ranges;
                compatible = "simple-bus";

+
+               ext_intc: interrupt-controller@10000018 {
+                       compatible = "brcm,bcm6345-ext-intc";
+                       reg = <0x10000018 0x4>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+
+                       interrupt-parent = <&periph_intc>;
+                       interrupts = <40>, <41>, <42>, <43>;
+               };
+
+               periph_intc: interrupt-controller@10000020 {
+                       compatible = "brcm,bcm6345-l2-intc";
+                       reg = <0x10000020 0x10>,
+                             <0x10000030 0x10>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <1>;
+
+                       interrupt-parent = <&cpu_intc>;
+                       interrupts = <2>, <3>;
+               };

        };
 };
        };
 };

diff --git a/target/linux/brcm63xx/dts/bcm6368.dtsi b/target/linux/brcm63xx/dts/bcm6368.dtsi
index 378f4fb5bfda6f3b3d2e2ea8c43257d5c9ac2abe..dcbbdbfe81ecad4f0e5daa14b342cf73388f7aa2 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm6368.dtsi
+++ b/target/linux/brcm63xx/dts/bcm6368.dtsi
@@ -24,6 +24,14 @@
                };
        };
 
                };
        };
 

+       cpu_intc: interrupt-controller {
+               #address-cells = <0>;
+               compatible = "mti,cpu-interrupt-controller";
+
+               interrupt-controller;
+               #interrupt-cells = <1>;
+       };
+

        memory { device_type = "memory"; reg = <0 0>; };
 
        ubus@10000000 {
        memory { device_type = "memory"; reg = <0 0>; };
 
        ubus@10000000 {


@@ -31,6 +39,40 @@
                #size-cells = <1>;
                ranges;
                compatible = "simple-bus";
                #size-cells = <1>;
                ranges;
                compatible = "simple-bus";

+
+               ext_intc0: interrupt-controller@10000018 {
+                       compatible = "brcm,bcm6345-ext-intc";
+                       reg = <0x10000018 0x4>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+
+                       interrupt-parent = <&periph_intc>;
+                       interrupts = <20>, <21>, <22>, <23>;
+               };
+
+               ext_intc1: interrupt-controller@1000001c {
+                       compatible = "brcm,bcm6345-ext-intc";
+                       reg = <0x1000001c 0x4>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+
+                       interrupt-parent = <&periph_intc>;
+                       interrupts = <24>, <25>;
+               };
+
+               periph_intc: interrupt-controller@10000020 {
+                       compatible = "brcm,bcm6345-l2-intc";
+                       reg = <0x10000020 0x10>,
+                             <0x10000030 0x10>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <1>;
+
+                       interrupt-parent = <&cpu_intc>;
+                       interrupts = <2>, <3>;
+               };

        };
 
        pflash: nor@18000000 {
        };
 
        pflash: nor@18000000 {

diff --git a/target/linux/brcm63xx/patches-3.14/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch b/target/linux/brcm63xx/patches-3.14/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch
new file mode 100644 (file)
index 0000000..5a74ddb
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.14/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch
@@ -0,0 +1,38 @@
+From 7c22b08baba941a8c83072047b0d2b55a6b952aa Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jogo@openwrt.org>
+Date: Mon, 1 Dec 2014 00:20:07 +0100
+Subject: [PATCH] MIPS: BCM63XX: register interrupt controllers through DT
+
+Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+---
+ arch/mips/bcm63xx/irq.c |   10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+--- a/arch/mips/bcm63xx/irq.c
++++ b/arch/mips/bcm63xx/irq.c
+@@ -15,6 +15,8 @@
+ #include <linux/irqchip.h>
+ #include <linux/irqchip/irq-bcm6345-ext-intc.h>
+ #include <linux/irqchip/irq-bcm6345-l2-intc.h>
++#include <linux/of.h>
++#include <linux/of_fdt.h>
+ #include <asm/irq_cpu.h>
+ #include <asm/mipsregs.h>
+ #include <bcm63xx_cpu.h>
+@@ -189,7 +191,15 @@ static void bcm63xx_init_irq(void)
+                                     ext_shift);
+ }
+ 
++static const struct of_device_id irqchip_of_match_mips_cpu_intc __used __section(__irqchip_of_table) = {
++      .compatible = "mti,cpu-interrupt-controller",
++      .data = mips_cpu_irq_of_init,
++};
++
+ void __init arch_init_irq(void)
+ {
+-      bcm63xx_init_irq();
++      if (initial_boot_params)
++              irqchip_init();
++      else
++              bcm63xx_init_irq();
+ }