Merge branch 'ralf-3.7' of git://git.linux-mips.org/pub/scm/sjhill/linux-sjhill into mips-for-linux-next

1 files changed, 34 insertions, 0 deletions

diff --git a/arch/mips/mti-malta/malta-int.c b/arch/mips/mti-malta/malta-int.c
index fea823f18479..647b86383184 100644
--- a/arch/mips/mti-malta/malta-int.c
+++ b/arch/mips/mti-malta/malta-int.c
@@ -750,3 +750,37 @@ int malta_be_handler(struct pt_regs *regs, int is_fixup)
 
         return retval;
 }
+
+void gic_enable_interrupt(int irq_vec)
+{
+        GIC_SET_INTR_MASK(irq_vec);
+}
+
+void gic_disable_interrupt(int irq_vec)
+{
+        GIC_CLR_INTR_MASK(irq_vec);
+}
+
+void gic_irq_ack(struct irq_data *d)
+{
+        int irq = (d->irq - gic_irq_base);
+
+        GIC_CLR_INTR_MASK(irq);
+
+        if (gic_irq_flags[irq] & GIC_TRIG_EDGE)
+                GICWRITE(GIC_REG(SHARED, GIC_SH_WEDGE), irq);
+}
+
+void gic_finish_irq(struct irq_data *d)
+{
+        /* Enable interrupts. */
+        GIC_SET_INTR_MASK(d->irq - gic_irq_base);
+}
+
+void __init gic_platform_init(int irqs, struct irq_chip *irq_controller)
+{
+        int i;
+
+        for (i = gic_irq_base; i < (gic_irq_base + irqs); i++)
+                irq_set_chip(i, irq_controller);
+}