From: Gregory CLEMENT <gregory.clement@bootlin.com>
To: Thomas Gleixner <tglx@linutronix.de>,
Jason Cooper <jason@lakedaemon.net>,
Marc Zyngier <maz@kernel.org>,
linux-kernel@vger.kernel.org, Rob Herring <robh+dt@kernel.org>,
devicetree@vger.kernel.org
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Lars Povlsen <lars.povlsen@microchip.com>,
<Steen.Hegelund@microchip.com>,
Gregory CLEMENT <gregory.clement@bootlin.com>
Subject: [PATCH v5 4/6] irqchip: ocelot: Add support for Luton platforms
Date: Wed, 25 Nov 2020 11:32:04 +0100 [thread overview]
Message-ID: <20201125103206.136498-5-gregory.clement@bootlin.com> (raw)
In-Reply-To: <20201125103206.136498-1-gregory.clement@bootlin.com>
This patch extends irqchip driver for oceleot to be used with an other
vcoreiii base platform: Luton.
For this platform there is a few differences:
- the interrupt must be enabled for the parent controller
- there is no trigger register needed to be managed
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
---
drivers/irqchip/irq-mscc-ocelot.c | 38 +++++++++++++++++++++++++++----
1 file changed, 34 insertions(+), 4 deletions(-)
diff --git a/drivers/irqchip/irq-mscc-ocelot.c b/drivers/irqchip/irq-mscc-ocelot.c
index 6d4029a2ded0..496f955b8fc4 100644
--- a/drivers/irqchip/irq-mscc-ocelot.c
+++ b/drivers/irqchip/irq-mscc-ocelot.c
@@ -16,6 +16,7 @@
#define ICPU_CFG_INTR_INTR_TRIGGER(_p, x) ((_p)->reg_off_trigger + 0x4 * (x))
#define FLAGS_HAS_TRIGGER BIT(0)
+#define FLAGS_NEED_INIT_ENABLE BIT(1)
struct chip_props {
u8 flags;
@@ -40,6 +41,17 @@ static struct chip_props ocelot_props = {
.n_irq = 24,
};
+static struct chip_props luton_props = {
+ .flags = FLAGS_NEED_INIT_ENABLE,
+ .reg_off_sticky = 0,
+ .reg_off_ena = 0x4,
+ .reg_off_ena_clr = 0x8,
+ .reg_off_ena_set = 0xc,
+ .reg_off_ident = 0x18,
+ .reg_off_ena_irq0 = 0x14,
+ .n_irq = 28,
+};
+
static void ocelot_irq_unmask(struct irq_data *data)
{
struct irq_chip_generic *gc = irq_data_get_irq_chip_data(data);
@@ -115,17 +127,27 @@ static int __init vcoreiii_irq_init(struct device_node *node,
goto err_gc_free;
}
- gc->chip_types[0].regs.ack = p->reg_off_sticky;
- gc->chip_types[0].regs.mask = p->reg_off_ena_clr;
gc->chip_types[0].chip.irq_ack = irq_gc_ack_set_bit;
- gc->chip_types[0].chip.irq_mask = irq_gc_mask_set_bit;
- if (p->flags & FLAGS_HAS_TRIGGER)
+ gc->chip_types[0].regs.ack = p->reg_off_sticky;
+ if (p->flags & FLAGS_HAS_TRIGGER) {
+ gc->chip_types[0].regs.mask = p->reg_off_ena_clr;
gc->chip_types[0].chip.irq_unmask = ocelot_irq_unmask;
+ gc->chip_types[0].chip.irq_mask = irq_gc_mask_set_bit;
+ } else {
+ gc->chip_types[0].regs.enable = p->reg_off_ena_set;
+ gc->chip_types[0].regs.disable = p->reg_off_ena_clr;
+ gc->chip_types[0].chip.irq_mask = irq_gc_mask_disable_reg;
+ gc->chip_types[0].chip.irq_unmask = irq_gc_unmask_enable_reg;
+ }
/* Mask and ack all interrupts */
irq_reg_writel(gc, 0, p->reg_off_ena);
irq_reg_writel(gc, 0xffffffff, p->reg_off_sticky);
+ /* Overall init */
+ if (p->flags & FLAGS_NEED_INIT_ENABLE)
+ irq_reg_writel(gc, BIT(0), p->reg_off_ena_irq0);
+
domain->host_data = p;
irq_set_chained_handler_and_data(parent_irq, ocelot_irq_handler,
domain);
@@ -148,3 +170,11 @@ static int __init ocelot_irq_init(struct device_node *node,
}
IRQCHIP_DECLARE(ocelot_icpu, "mscc,ocelot-icpu-intr", ocelot_irq_init);
+
+static int __init luton_irq_init(struct device_node *node,
+ struct device_node *parent)
+{
+ return vcoreiii_irq_init(node, parent, &luton_props);
+}
+
+IRQCHIP_DECLARE(luton_icpu, "mscc,luton-icpu-intr", luton_irq_init);
--
2.29.2
next prev parent reply other threads:[~2020-11-25 10:32 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-25 10:32 [PATCH v5 0/6] Extend irqchip ocelot driver to support other SoCs Gregory CLEMENT
2020-11-25 10:32 ` [PATCH v5 1/6] dt-bindings: interrupt-controller: convert icpu intr bindings to json-schema Gregory CLEMENT
2020-11-30 22:52 ` Rob Herring
2020-12-11 14:58 ` [irqchip: irq/irqchip-next] " irqchip-bot for Gregory CLEMENT
2020-11-25 10:32 ` [PATCH v5 2/6] dt-bindings: interrupt-controller: Add binding for few Microsemi interrupt controllers Gregory CLEMENT
2020-11-30 22:52 ` Rob Herring
2020-12-11 14:58 ` [irqchip: irq/irqchip-next] " irqchip-bot for Gregory CLEMENT
2020-11-25 10:32 ` [PATCH v5 3/6] irqchip: ocelot: prepare to support more SoC Gregory CLEMENT
2020-12-11 14:58 ` [irqchip: irq/irqchip-next] irqchip/ocelot: " irqchip-bot for Gregory CLEMENT
2020-11-25 10:32 ` Gregory CLEMENT [this message]
2020-12-11 14:58 ` [irqchip: irq/irqchip-next] irqchip/ocelot: Add support for Luton platforms irqchip-bot for Gregory CLEMENT
2020-11-25 10:32 ` [PATCH v5 5/6] irqchip: ocelot: Add support for Serval platforms Gregory CLEMENT
2020-12-11 14:58 ` [irqchip: irq/irqchip-next] irqchip/ocelot: " irqchip-bot for Gregory CLEMENT
2020-11-25 10:32 ` [PATCH v5 6/6] irqchip: ocelot: Add support for Jaguar2 platforms Gregory CLEMENT
2020-12-11 14:58 ` [irqchip: irq/irqchip-next] irqchip/ocelot: " irqchip-bot for Gregory CLEMENT
2020-12-11 15:01 ` [PATCH v5 0/6] Extend irqchip ocelot driver to support other SoCs Marc Zyngier
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=20201125103206.136498-5-gregory.clement@bootlin.com \
--to=gregory.clement@bootlin.com \
--cc=Steen.Hegelund@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=devicetree@vger.kernel.org \
--cc=jason@lakedaemon.net \
--cc=lars.povlsen@microchip.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=robh+dt@kernel.org \
--cc=tglx@linutronix.de \
--cc=thomas.petazzoni@bootlin.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).