Merge tag 'trace-seq-buf-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...

[cascardo/linux.git] / drivers / irqchip / irq-atmel-aic-common.c

diff --git a/drivers/irqchip/irq-atmel-aic-common.c b/drivers/irqchip/irq-atmel-aic-common.c
index 6ae3cde..d111ac7 100644 (file)
--- a/drivers/irqchip/irq-atmel-aic-common.c
+++ b/drivers/irqchip/irq-atmel-aic-common.c
@@ -167,6 +167,32 @@ void __init aic_common_rtc_irq_fixup(struct device_node *root)
        iounmap(regs);
 }
 
+#define AT91_RTT_MR            0x00                    /* Real-time Mode Register */
+#define AT91_RTT_ALMIEN                (1 << 16)               /* Alarm Interrupt Enable */
+#define AT91_RTT_RTTINCIEN     (1 << 17)               /* Real Time Timer Increment Interrupt Enable */
+
+void __init aic_common_rtt_irq_fixup(struct device_node *root)
+{
+       struct device_node *np;
+       void __iomem *regs;
+
+       /*
+        * The at91sam9263 SoC has 2 instances of the RTT block, hence we
+        * iterate over the DT to find each occurrence.
+        */
+       for_each_compatible_node(np, NULL, "atmel,at91sam9260-rtt") {
+               regs = of_iomap(np, 0);
+               if (!regs)
+                       continue;
+
+               writel(readl(regs + AT91_RTT_MR) &
+                      ~(AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN),
+                      regs + AT91_RTT_MR);
+
+               iounmap(regs);
+       }
+}
+
 void __init aic_common_irq_fixup(const struct of_device_id *matches)
 {
        struct device_node *root = of_find_node_by_path("/");
@@ -217,8 +243,9 @@ struct irq_domain *__init aic_common_of_init(struct device_node *node,
        }
 
        ret = irq_alloc_domain_generic_chips(domain, 32, 1, name,
-                                            handle_level_irq, 0, 0,
-                                            IRQCHIP_SKIP_SET_WAKE);
+                                            handle_fasteoi_irq,
+                                            IRQ_NOREQUEST | IRQ_NOPROBE |
+                                            IRQ_NOAUTOEN, 0, 0);
        if (ret)
                goto err_domain_remove;
 
@@ -230,7 +257,6 @@ struct irq_domain *__init aic_common_of_init(struct device_node *node,
                gc->unused = 0;
                gc->wake_enabled = ~0;
                gc->chip_types[0].type = IRQ_TYPE_SENSE_MASK;
-               gc->chip_types[0].handler = handle_fasteoi_irq;
                gc->chip_types[0].chip.irq_eoi = irq_gc_eoi;
                gc->chip_types[0].chip.irq_set_wake = irq_gc_set_wake;
                gc->chip_types[0].chip.irq_shutdown = aic_common_shutdown;