Merge branch 'irqchip/atmel' into irqchip/core

3 files changed, 49 insertions, 5 deletions

diff --git a/drivers/irqchip/irq-atmel-aic-common.c b/drivers/irqchip/irq-atmel-aic-common.c
index 6ae3cdee0681..656cfe336837 100644
--- 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 90aa00e918d6..603f0a9d5411 100644
--- 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 */
diff --git a/drivers/irqchip/irq-atmel-aic.c b/drivers/irqchip/irq-atmel-aic.c
index 27fdd8c3e7b4..dae3604b32a9 100644
--- a/drivers/irqchip/irq-atmel-aic.c
+++ b/drivers/irqchip/irq-atmel-aic.c
@@ -209,16 +209,32 @@ static const struct irq_domain_ops aic_irq_ops = {
         .xlate  = aic_irq_domain_xlate,
 };
 
-static void __init at91sam9_aic_irq_fixup(struct device_node *root)
+static void __init at91rm9200_aic_irq_fixup(struct device_node *root)
 {
         aic_common_rtc_irq_fixup(root);
 }
 
+static void __init at91sam9260_aic_irq_fixup(struct device_node *root)
+{
+        aic_common_rtt_irq_fixup(root);
+}
+
+static void __init at91sam9g45_aic_irq_fixup(struct device_node *root)
+{
+        aic_common_rtc_irq_fixup(root);
+        aic_common_rtt_irq_fixup(root);
+}
+
 static const struct of_device_id __initdata aic_irq_fixups[] = {
-        { .compatible = "atmel,at91sam9g45", .data = at91sam9_aic_irq_fixup },
-        { .compatible = "atmel,at91sam9n12", .data = at91sam9_aic_irq_fixup },
-        { .compatible = "atmel,at91sam9rl", .data = at91sam9_aic_irq_fixup },
-        { .compatible = "atmel,at91sam9x5", .data = at91sam9_aic_irq_fixup },
+        { .compatible = "atmel,at91rm9200", .data = at91rm9200_aic_irq_fixup },
+        { .compatible = "atmel,at91sam9g45", .data = at91sam9g45_aic_irq_fixup },
+        { .compatible = "atmel,at91sam9n12", .data = at91rm9200_aic_irq_fixup },
+        { .compatible = "atmel,at91sam9rl", .data = at91sam9g45_aic_irq_fixup },
+        { .compatible = "atmel,at91sam9x5", .data = at91rm9200_aic_irq_fixup },
+        { .compatible = "atmel,at91sam9260", .data = at91sam9260_aic_irq_fixup },
+        { .compatible = "atmel,at91sam9261", .data = at91sam9260_aic_irq_fixup },
+        { .compatible = "atmel,at91sam9263", .data = at91sam9260_aic_irq_fixup },
+        { .compatible = "atmel,at91sam9g20", .data = at91sam9260_aic_irq_fixup },
         { /* sentinel */ },
 };