diff options
author | Jonas Gorski <jogo@openwrt.org> | 2014-12-01 00:52:07 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2014-12-01 00:52:07 +0000 |
commit | e8068f0b1b4e53559ae0c58910b8905bee9b61ab (patch) | |
tree | cf44e0daeb888e0b4c69d9bf8483088a05239b96 /target/linux/brcm63xx/patches-3.14 | |
parent | 443d730da80775f4e6740f947b447e0bffef3644 (diff) | |
download | upstream-e8068f0b1b4e53559ae0c58910b8905bee9b61ab.tar.gz upstream-e8068f0b1b4e53559ae0c58910b8905bee9b61ab.tar.bz2 upstream-e8068f0b1b4e53559ae0c58910b8905bee9b61ab.zip |
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
Diffstat (limited to 'target/linux/brcm63xx/patches-3.14')
-rw-r--r-- | target/linux/brcm63xx/patches-3.14/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch | 38 |
1 files changed, 38 insertions, 0 deletions
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 index 0000000000..5a74ddb839 --- /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(); + } |