MIPS: ralink: add CPU interrupt controller to of_irq_ids

Convert the ralink IRQ code to make use of the new MIPS IRQ controller OF
mappings.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: John Crispin <blogic@openwrt.org>
Acked-by: David Daney <david.daney@cavium.com>
Patchwork: http://patchwork.linux-mips.org/patch/4900/

diff --git a/arch/mips/ralink/dts/rt3050.dtsi b/arch/mips/ralink/dts/rt3050.dtsi
index fd49daacbf084fa5532f8e4c7532f1060ea084c0..069d0660e1ddaf844922ba6dffb7e7a838f7284d 100644 (file)
--- a/arch/mips/ralink/dts/rt3050.dtsi
+++ b/arch/mips/ralink/dts/rt3050.dtsi
@@ -13,6 +13,13 @@
                bootargs = "console=ttyS0,57600 init=/init";
        };
 
+       cpuintc: cpuintc@0 {
+               #address-cells = <0>;
+               #interrupt-cells = <1>;
+               interrupt-controller;
+               compatible = "mti,cpu-interrupt-controller";
+       };
+
        palmbus@10000000 {
                compatible = "palmbus";
                reg = <0x10000000 0x200000>;
@@ -37,6 +44,9 @@
 
                        interrupt-controller;
                        #interrupt-cells = <1>;
+
+                       interrupt-parent = <&cpuintc>;
+                       interrupts = <2>;
                };
 
                memc@300 {

diff --git a/arch/mips/ralink/irq.c b/arch/mips/ralink/irq.c
index e62c9751e2d80096b2afd3bf1a2a3f616af55ef1..6d054c5ec9ab03bf83950d152fdc173dbd0d8b56 100644 (file)
--- a/arch/mips/ralink/irq.c
+++ b/arch/mips/ralink/irq.c
@@ -128,8 +128,11 @@ static int __init intc_of_init(struct device_node *node,
 {
        struct resource res;
        struct irq_domain *domain;
+       int irq;
 
-       mips_cpu_irq_init();
+       irq = irq_of_parse_and_map(node, 0);
+       if (!irq)
+               panic("Failed to get INTC IRQ");
 
        if (of_address_to_resource(node, 0, &res))
                panic("Failed to get intc memory range");
@@ -156,8 +159,8 @@ static int __init intc_of_init(struct device_node *node,
 
        rt_intc_w32(INTC_INT_GLOBAL, INTC_REG_ENABLE);
 
-       irq_set_chained_handler(RALINK_CPU_IRQ_INTC, ralink_intc_irq_handler);
-       irq_set_handler_data(RALINK_CPU_IRQ_INTC, domain);
+       irq_set_chained_handler(irq, ralink_intc_irq_handler);
+       irq_set_handler_data(irq, domain);
 
        cp0_perfcount_irq = irq_create_mapping(domain, 9);
 
@@ -165,6 +168,7 @@ static int __init intc_of_init(struct device_node *node,
 }
 
 static struct of_device_id __initdata of_irq_ids[] = {
+       { .compatible = "mti,cpu-interrupt-controller", .data = mips_cpu_intc_init },
        { .compatible = "ralink,rt2880-intc", .data = intc_of_init },
        {},
 };