diff options
author | Jason Cooper <jason@lakedaemon.net> | 2014-10-02 09:03:48 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2014-10-02 09:03:48 -0400 |
commit | a778bf35bd928653a0d9c9313a56866be8aab59d (patch) | |
tree | 7a5d29423bc57ea62b28a90003f429cad0482e04 /drivers/irqchip/irq-atmel-aic5.c | |
parent | 468a903c0e5147e3f93187f0b808a3ef957fd00e (diff) | |
parent | 20afdeb812da4097447eb324f34be11a10b11542 (diff) |
Merge branch 'irqchip/atmel' into irqchip/core
Diffstat (limited to 'drivers/irqchip/irq-atmel-aic5.c')
-rw-r--r-- | drivers/irqchip/irq-atmel-aic5.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-atmel-aic5.c b/drivers/irqchip/irq-atmel-aic5.c index 04fe2c1b5178..a11aae8fb006 100644 --- a/drivers/irqchip/irq-atmel-aic5.c +++ b/drivers/irqchip/irq-atmel-aic5.c | |||
@@ -295,6 +295,7 @@ static void __init sama5d3_aic_irq_fixup(struct device_node *root) | |||
295 | 295 | ||
296 | static const struct of_device_id __initdata aic5_irq_fixups[] = { | 296 | static const struct of_device_id __initdata aic5_irq_fixups[] = { |
297 | { .compatible = "atmel,sama5d3", .data = sama5d3_aic_irq_fixup }, | 297 | { .compatible = "atmel,sama5d3", .data = sama5d3_aic_irq_fixup }, |
298 | { .compatible = "atmel,sama5d4", .data = sama5d3_aic_irq_fixup }, | ||
298 | { /* sentinel */ }, | 299 | { /* sentinel */ }, |
299 | }; | 300 | }; |
300 | 301 | ||
@@ -341,7 +342,7 @@ static int __init aic5_of_init(struct device_node *node, | |||
341 | return 0; | 342 | return 0; |
342 | } | 343 | } |
343 | 344 | ||
344 | #define NR_SAMA5D3_IRQS 50 | 345 | #define NR_SAMA5D3_IRQS 48 |
345 | 346 | ||
346 | static int __init sama5d3_aic5_of_init(struct device_node *node, | 347 | static int __init sama5d3_aic5_of_init(struct device_node *node, |
347 | struct device_node *parent) | 348 | struct device_node *parent) |
@@ -349,3 +350,12 @@ static int __init sama5d3_aic5_of_init(struct device_node *node, | |||
349 | return aic5_of_init(node, parent, NR_SAMA5D3_IRQS); | 350 | return aic5_of_init(node, parent, NR_SAMA5D3_IRQS); |
350 | } | 351 | } |
351 | IRQCHIP_DECLARE(sama5d3_aic5, "atmel,sama5d3-aic", sama5d3_aic5_of_init); | 352 | IRQCHIP_DECLARE(sama5d3_aic5, "atmel,sama5d3-aic", sama5d3_aic5_of_init); |
353 | |||
354 | #define NR_SAMA5D4_IRQS 68 | ||
355 | |||
356 | static int __init sama5d4_aic5_of_init(struct device_node *node, | ||
357 | struct device_node *parent) | ||
358 | { | ||
359 | return aic5_of_init(node, parent, NR_SAMA5D4_IRQS); | ||
360 | } | ||
361 | IRQCHIP_DECLARE(sama5d4_aic5, "atmel,sama5d4-aic", sama5d4_aic5_of_init); | ||