1 files changed, 33 insertions, 12 deletions

diff --git a/arch/mips/ralink/irq.c b/arch/mips/ralink/irq.c
index 781b3d14a489..7cf91b92e9d1 100644
--- a/arch/mips/ralink/irq.c
+++ b/arch/mips/ralink/irq.c
@@ -20,14 +20,6 @@
 
 #include "common.h"
 
-/* INTC register offsets */
-#define INTC_REG_STATUS0        0x00
-#define INTC_REG_STATUS1        0x04
-#define INTC_REG_TYPE           0x20
-#define INTC_REG_RAW_STATUS     0x30
-#define INTC_REG_ENABLE         0x34
-#define INTC_REG_DISABLE        0x38
-
 #define INTC_INT_GLOBAL         BIT(31)
 
 #define RALINK_CPU_IRQ_INTC     (MIPS_CPU_IRQ_BASE + 2)
@@ -44,16 +36,36 @@
 
 #define RALINK_INTC_IRQ_PERFC   (RALINK_INTC_IRQ_BASE + 9)
 
+enum rt_intc_regs_enum {
+        INTC_REG_STATUS0 = 0,
+        INTC_REG_STATUS1,
+        INTC_REG_TYPE,
+        INTC_REG_RAW_STATUS,
+        INTC_REG_ENABLE,
+        INTC_REG_DISABLE,
+};
+
+static u32 rt_intc_regs[] = {
+        [INTC_REG_STATUS0] = 0x00,
+        [INTC_REG_STATUS1] = 0x04,
+        [INTC_REG_TYPE] = 0x20,
+        [INTC_REG_RAW_STATUS] = 0x30,
+        [INTC_REG_ENABLE] = 0x34,
+        [INTC_REG_DISABLE] = 0x38,
+};
+
 static void __iomem *rt_intc_membase;
 
+static int rt_perfcount_irq;
+
 static inline void rt_intc_w32(u32 val, unsigned reg)
 {
-        __raw_writel(val, rt_intc_membase + reg);
+        __raw_writel(val, rt_intc_membase + rt_intc_regs[reg]);
 }
 
 static inline u32 rt_intc_r32(unsigned reg)
 {
-        return __raw_readl(rt_intc_membase + reg);
+        return __raw_readl(rt_intc_membase + rt_intc_regs[reg]);
 }
 
 static void ralink_intc_irq_unmask(struct irq_data *d)
@@ -73,6 +85,11 @@ static struct irq_chip ralink_intc_irq_chip = {
         .irq_mask_ack   = ralink_intc_irq_mask,
 };
 
+int get_c0_perfcount_int(void)
+{
+        return rt_perfcount_irq;
+}
+
 unsigned int get_c0_compare_int(void)
 {
         return CP0_LEGACY_COMPARE_IRQ;
@@ -134,6 +151,10 @@ static int __init intc_of_init(struct device_node *node,
         struct irq_domain *domain;
         int irq;
 
+        if (!of_property_read_u32_array(node, "ralink,intc-registers",
+                                        rt_intc_regs, 6))
+                pr_info("intc: using register map from devicetree\n");
+
         irq = irq_of_parse_and_map(node, 0);
         if (!irq)
                 panic("Failed to get INTC IRQ");
@@ -167,13 +188,13 @@ static int __init intc_of_init(struct device_node *node,
         irq_set_handler_data(irq, domain);
 
         /* tell the kernel which irq is used for performance monitoring */
-        cp0_perfcount_irq = irq_create_mapping(domain, 9);
+        rt_perfcount_irq = irq_create_mapping(domain, 9);
 
         return 0;
 }
 
 static struct of_device_id __initdata of_irq_ids[] = {
-        { .compatible = "mti,cpu-interrupt-controller", .data = mips_cpu_intc_init },
+        { .compatible = "mti,cpu-interrupt-controller", .data = mips_cpu_irq_of_init },
         { .compatible = "ralink,rt2880-intc", .data = intc_of_init },
         {},
 };