Merge branch 'irqchip/atmel' into irqchip/core

1 files changed, 21 insertions, 5 deletions

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 */ },
 };