irqchip: atmel-aic: Add irq fixup for RTT block

Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Link: https://lkml.kernel.org/r/1415003464-29239-2-git-send-email-boris.brezillon@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/drivers/irqchip/irq-atmel-aic-common.c b/drivers/irqchip/irq-atmel-aic-common.c
index 6ae3cdee0681a8008218fbcf25762280b64e48ce..656cfe336837e9e22a4b7d03629744fd0a2ad35a 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("/");

diff --git a/drivers/irqchip/irq-atmel-aic-common.h b/drivers/irqchip/irq-atmel-aic-common.h
index 90aa00e918d6fdf952ebaa250e67b0a4fff1a500..603f0a9d5411afe0f5f50880cea9048f087cc408 100644 (file)
--- a/drivers/irqchip/irq-atmel-aic-common.h
+++ b/drivers/irqchip/irq-atmel-aic-common.h
@@ -34,6 +34,8 @@ struct irq_domain *__init aic_common_of_init(struct device_node *node,
 
 void __init aic_common_rtc_irq_fixup(struct device_node *root);
 
+void __init aic_common_rtt_irq_fixup(struct device_node *root);
+
 void __init aic_common_irq_fixup(const struct of_device_id *matches);
 
 #endif /* __IRQ_ATMEL_AIC_COMMON_H */