diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-10-02 15:03:48 +0200 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-10-02 15:03:48 +0200 |
| commit | a778bf35bd928653a0d9c9313a56866be8aab59d (patch) | |
| tree | 7a5d29423bc57ea62b28a90003f429cad0482e04 | |
| parent | Merge branch 'irqchip/handle_domain' into irqchip/core (diff) | |
| parent | irqchip: atmel-aic5: Add sama5d4 support (diff) | |
| download | linux-a778bf35bd928653a0d9c9313a56866be8aab59d.tar.xz linux-a778bf35bd928653a0d9c9313a56866be8aab59d.zip | |
Merge branch 'irqchip/atmel' into irqchip/core
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/atmel,aic.txt | 2 | ||||
| -rw-r--r-- | drivers/irqchip/irq-atmel-aic5.c | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/interrupt-controller/atmel,aic.txt b/Documentation/devicetree/bindings/interrupt-controller/atmel,aic.txt index 2742e9cfd6b1..f292917fa00d 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/atmel,aic.txt +++ b/Documentation/devicetree/bindings/interrupt-controller/atmel,aic.txt @@ -2,7 +2,7 @@ Required properties: - compatible: Should be "atmel,<chip>-aic" - <chip> can be "at91rm9200" or "sama5d3" + <chip> can be "at91rm9200", "sama5d3" or "sama5d4" - interrupt-controller: Identifies the node as an interrupt controller. - interrupt-parent: For single AIC system, it is an empty property. - #interrupt-cells: The number of cells to define the interrupts. It should be 3. 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) static const struct of_device_id __initdata aic5_irq_fixups[] = { { .compatible = "atmel,sama5d3", .data = sama5d3_aic_irq_fixup }, + { .compatible = "atmel,sama5d4", .data = sama5d3_aic_irq_fixup }, { /* sentinel */ }, }; @@ -341,7 +342,7 @@ static int __init aic5_of_init(struct device_node *node, return 0; } -#define NR_SAMA5D3_IRQS 50 +#define NR_SAMA5D3_IRQS 48 static int __init sama5d3_aic5_of_init(struct device_node *node, struct device_node *parent) @@ -349,3 +350,12 @@ static int __init sama5d3_aic5_of_init(struct device_node *node, return aic5_of_init(node, parent, NR_SAMA5D3_IRQS); } IRQCHIP_DECLARE(sama5d3_aic5, "atmel,sama5d3-aic", sama5d3_aic5_of_init); + +#define NR_SAMA5D4_IRQS 68 + +static int __init sama5d4_aic5_of_init(struct device_node *node, + struct device_node *parent) +{ + return aic5_of_init(node, parent, NR_SAMA5D4_IRQS); +} +IRQCHIP_DECLARE(sama5d4_aic5, "atmel,sama5d4-aic", sama5d4_aic5_of_init); |