[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-62a993df31f795d87bcb4c6cb005d36f32f6ad55@git.kernel.org>
Date: Thu, 18 Jun 2015 06:33:28 -0700
From: tip-bot for Nicolas Ferre <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-arm-kernel@...ts.infradead.org, nicolas.ferre@...el.com,
hpa@...or.com, tglx@...utronix.de, ludovic.desroches@...el.com,
jason@...edaemon.net, linux-kernel@...r.kernel.org,
boris.brezillon@...e-electrons.com,
alexandre.belloni@...e-electrons.com, mingo@...nel.org
Subject: [tip:irq/core] irqchip: atmel-aic5: Add sama5d2 support
Commit-ID: 62a993df31f795d87bcb4c6cb005d36f32f6ad55
Gitweb: http://git.kernel.org/tip/62a993df31f795d87bcb4c6cb005d36f32f6ad55
Author: Nicolas Ferre <nicolas.ferre@...el.com>
AuthorDate: Thu, 18 Jun 2015 15:07:35 +0200
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Thu, 18 Jun 2015 15:29:52 +0200
irqchip: atmel-aic5: Add sama5d2 support
Add sama5d2 support to irq-atmel-aic5.
Signed-off-by: Nicolas Ferre <nicolas.ferre@...el.com>
Cc: Boris BREZILLON <boris.brezillon@...e-electrons.com>
Cc: Alexandre Belloni <alexandre.belloni@...e-electrons.com>
Cc: Ludovic Desroches <ludovic.desroches@...el.com>
Cc: Jason Cooper <jason@...edaemon.net>
Cc: <linux-arm-kernel@...ts.infradead.org>
Link: http://lkml.kernel.org/r/1434632855-27272-1-git-send-email-nicolas.ferre@atmel.com
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
.../devicetree/bindings/interrupt-controller/atmel,aic.txt | 2 +-
drivers/irqchip/irq-atmel-aic5.c | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/interrupt-controller/atmel,aic.txt b/Documentation/devicetree/bindings/interrupt-controller/atmel,aic.txt
index f292917..0e9f09a 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", "sama5d3" or "sama5d4"
+ <chip> can be "at91rm9200", "sama5d2", "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 a2e8c3f..459bf44 100644
--- a/drivers/irqchip/irq-atmel-aic5.c
+++ b/drivers/irqchip/irq-atmel-aic5.c
@@ -339,6 +339,15 @@ static int __init aic5_of_init(struct device_node *node,
return 0;
}
+#define NR_SAMA5D2_IRQS 77
+
+static int __init sama5d2_aic5_of_init(struct device_node *node,
+ struct device_node *parent)
+{
+ return aic5_of_init(node, parent, NR_SAMA5D2_IRQS);
+}
+IRQCHIP_DECLARE(sama5d2_aic5, "atmel,sama5d2-aic", sama5d2_aic5_of_init);
+
#define NR_SAMA5D3_IRQS 48
static int __init sama5d3_aic5_of_init(struct device_node *node,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists