xtensa: allow variant to initialize own irq chips

[deliverable/linux.git] / arch / xtensa / kernel / irq.c

diff --git a/arch/xtensa/kernel/irq.c b/arch/xtensa/kernel/irq.c
index f3b66fba5b8f71f0f45700601b9117dd865ae9b9..a1badb32fcdaea8b43350f3853f8efc66be928d8 100644 (file)
--- a/arch/xtensa/kernel/irq.c
+++ b/arch/xtensa/kernel/irq.c
@@ -132,6 +132,18 @@ static void xtensa_irq_unmask(unsigned int irq)
        set_sr (cached_irq_mask, INTENABLE);
 }
 
+static void xtensa_irq_enable(unsigned int irq)
+{
+       variant_irq_enable(irq);
+       xtensa_irq_unmask(irq);
+}
+
+static void xtensa_irq_disable(unsigned int irq)
+{
+       xtensa_irq_mask(irq);
+       variant_irq_disable(irq);
+}
+
 static void xtensa_irq_ack(unsigned int irq)
 {
        set_sr(1 << irq, INTCLEAR);
@@ -146,6 +158,8 @@ static int xtensa_irq_retrigger(unsigned int irq)
 
 static struct irq_chip xtensa_irq_chip = {
        .name           = "xtensa",
+       .enable         = xtensa_irq_enable,
+       .disable        = xtensa_irq_disable,
        .mask           = xtensa_irq_mask,
        .unmask         = xtensa_irq_unmask,
        .ack            = xtensa_irq_ack,
@@ -183,4 +197,6 @@ void __init init_IRQ(void)
        }
 
        cached_irq_mask = 0;
+
+       variant_init_irq();
 }