From: "tip-bot2 for Sandeep Sheriker Mallikarjun" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Sandeep Sheriker Mallikarjun
<sandeepsheriker.mallikarjun@microchip.com>,
Claudiu Beznea <claudiu.beznea@microchip.com>,
Marc Zyngier <maz@kernel.org>, Ingo Molnar <mingo@kernel.org>,
Borislav Petkov <bp@alien8.de>,
linux-kernel@vger.kernel.org
Subject: [tip: irq/urgent] irqchip/atmel-aic5: Add support for sam9x60 irqchip
Date: Mon, 14 Oct 2019 18:38:48 -0000 [thread overview]
Message-ID: <157107832805.12254.7183157920442567022.tip-bot2@tip-bot2> (raw)
In-Reply-To: <1568026835-6646-1-git-send-email-claudiu.beznea@microchip.com>
The following commit has been merged into the irq/urgent branch of tip:
Commit-ID: 212fbf2c9e84ceb267cadd8342156b69b54b8135
Gitweb: https://git.kernel.org/tip/212fbf2c9e84ceb267cadd8342156b69b54b8135
Author: Sandeep Sheriker Mallikarjun <sandeepsheriker.mallikarjun@microchip.com>
AuthorDate: Mon, 09 Sep 2019 14:00:35 +03:00
Committer: Marc Zyngier <maz@kernel.org>
CommitterDate: Mon, 09 Sep 2019 18:11:51 +01:00
irqchip/atmel-aic5: Add support for sam9x60 irqchip
Add support for SAM9X60 irqchip.
Signed-off-by: Sandeep Sheriker Mallikarjun <sandeepsheriker.mallikarjun@microchip.com>
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/1568026835-6646-1-git-send-email-claudiu.beznea@microchip.com
[claudiu.beznea@microchip.com: update aic5_irq_fixups[], update
documentation]
---
Documentation/devicetree/bindings/interrupt-controller/atmel,aic.txt | 7 +++++--
drivers/irqchip/irq-atmel-aic5.c | 10 ++++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/interrupt-controller/atmel,aic.txt b/Documentation/devicetree/bindings/interrupt-controller/atmel,aic.txt
index f4c5d34..7079d44 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/atmel,aic.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/atmel,aic.txt
@@ -1,8 +1,11 @@
* Advanced Interrupt Controller (AIC)
Required properties:
-- compatible: Should be "atmel,<chip>-aic"
- <chip> can be "at91rm9200", "sama5d2", "sama5d3" or "sama5d4"
+- compatible: Should be:
+ - "atmel,<chip>-aic" where <chip> can be "at91rm9200", "sama5d2",
+ "sama5d3" or "sama5d4"
+ - "microchip,<chip>-aic" where <chip> can be "sam9x60"
+
- interrupt-controller: Identifies the node as an interrupt controller.
- #interrupt-cells: The number of cells to define the interrupts. It should be 3.
The first cell is the IRQ number (aka "Peripheral IDentifier" on datasheet).
diff --git a/drivers/irqchip/irq-atmel-aic5.c b/drivers/irqchip/irq-atmel-aic5.c
index 6acad2e..2933349 100644
--- a/drivers/irqchip/irq-atmel-aic5.c
+++ b/drivers/irqchip/irq-atmel-aic5.c
@@ -313,6 +313,7 @@ static void __init sama5d3_aic_irq_fixup(void)
static const struct of_device_id aic5_irq_fixups[] __initconst = {
{ .compatible = "atmel,sama5d3", .data = sama5d3_aic_irq_fixup },
{ .compatible = "atmel,sama5d4", .data = sama5d3_aic_irq_fixup },
+ { .compatible = "microchip,sam9x60", .data = sama5d3_aic_irq_fixup },
{ /* sentinel */ },
};
@@ -390,3 +391,12 @@ static int __init sama5d4_aic5_of_init(struct device_node *node,
return aic5_of_init(node, parent, NR_SAMA5D4_IRQS);
}
IRQCHIP_DECLARE(sama5d4_aic5, "atmel,sama5d4-aic", sama5d4_aic5_of_init);
+
+#define NR_SAM9X60_IRQS 50
+
+static int __init sam9x60_aic5_of_init(struct device_node *node,
+ struct device_node *parent)
+{
+ return aic5_of_init(node, parent, NR_SAM9X60_IRQS);
+}
+IRQCHIP_DECLARE(sam9x60_aic5, "microchip,sam9x60-aic", sam9x60_aic5_of_init);
prev parent reply other threads:[~2019-10-14 18:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-09 11:00 [PATCH] irqchip/atmel-aic5: add support for sam9x60 irqchip Claudiu Beznea
2019-09-10 15:15 ` Alexandre Belloni
2019-09-13 14:36 ` Rob Herring
2019-10-14 18:38 ` tip-bot2 for Sandeep Sheriker Mallikarjun [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=157107832805.12254.7183157920442567022.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@alien8.de \
--cc=claudiu.beznea@microchip.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=maz@kernel.org \
--cc=mingo@kernel.org \
--cc=sandeepsheriker.mallikarjun@microchip.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).