From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755958AbbFRNe0 (ORCPT ); Thu, 18 Jun 2015 09:34:26 -0400 Received: from terminus.zytor.com ([198.137.202.10]:60903 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755931AbbFRNeM (ORCPT ); Thu, 18 Jun 2015 09:34:12 -0400 Date: Thu, 18 Jun 2015 06:33:28 -0700 From: tip-bot for Nicolas Ferre Message-ID: Cc: linux-arm-kernel@lists.infradead.org, nicolas.ferre@atmel.com, hpa@zytor.com, tglx@linutronix.de, ludovic.desroches@atmel.com, jason@lakedaemon.net, linux-kernel@vger.kernel.org, boris.brezillon@free-electrons.com, alexandre.belloni@free-electrons.com, mingo@kernel.org Reply-To: mingo@kernel.org, alexandre.belloni@free-electrons.com, linux-kernel@vger.kernel.org, boris.brezillon@free-electrons.com, jason@lakedaemon.net, ludovic.desroches@atmel.com, tglx@linutronix.de, hpa@zytor.com, linux-arm-kernel@lists.infradead.org, nicolas.ferre@atmel.com In-Reply-To: <1434632855-27272-1-git-send-email-nicolas.ferre@atmel.com> References: <1434632855-27272-1-git-send-email-nicolas.ferre@atmel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] irqchip: atmel-aic5: Add sama5d2 support Git-Commit-ID: 62a993df31f795d87bcb4c6cb005d36f32f6ad55 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 62a993df31f795d87bcb4c6cb005d36f32f6ad55 Gitweb: http://git.kernel.org/tip/62a993df31f795d87bcb4c6cb005d36f32f6ad55 Author: Nicolas Ferre AuthorDate: Thu, 18 Jun 2015 15:07:35 +0200 Committer: Thomas Gleixner 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 Cc: Boris BREZILLON Cc: Alexandre Belloni Cc: Ludovic Desroches Cc: Jason Cooper Cc: Link: http://lkml.kernel.org/r/1434632855-27272-1-git-send-email-nicolas.ferre@atmel.com Signed-off-by: Thomas Gleixner --- .../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,-aic" - can be "at91rm9200", "sama5d3" or "sama5d4" + 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,