Merge branch 'irqchip/atmel' into irqchip/core

This commit is contained in:
Jason Cooper 2014-10-02 13:03:48 +00:00
commit a778bf35bd
2 changed files with 12 additions and 2 deletions
Documentation/devicetree/bindings/interrupt-controller
drivers/irqchip

View File

@ -2,7 +2,7 @@
Required properties: Required properties:
- compatible: Should be "atmel,<chip>-aic" - 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-controller: Identifies the node as an interrupt controller.
- interrupt-parent: For single AIC system, it is an empty property. - 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. - #interrupt-cells: The number of cells to define the interrupts. It should be 3.

View File

@ -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[] = { static const struct of_device_id __initdata aic5_irq_fixups[] = {
{ .compatible = "atmel,sama5d3", .data = sama5d3_aic_irq_fixup }, { .compatible = "atmel,sama5d3", .data = sama5d3_aic_irq_fixup },
{ .compatible = "atmel,sama5d4", .data = sama5d3_aic_irq_fixup },
{ /* sentinel */ }, { /* sentinel */ },
}; };
@ -341,7 +342,7 @@ static int __init aic5_of_init(struct device_node *node,
return 0; return 0;
} }
#define NR_SAMA5D3_IRQS 50 #define NR_SAMA5D3_IRQS 48
static int __init sama5d3_aic5_of_init(struct device_node *node, static int __init sama5d3_aic5_of_init(struct device_node *node,
struct device_node *parent) 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); return aic5_of_init(node, parent, NR_SAMA5D3_IRQS);
} }
IRQCHIP_DECLARE(sama5d3_aic5, "atmel,sama5d3-aic", sama5d3_aic5_of_init); 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);