[PATCH 1/2] irqchip/ls-extirq: convert to a platform driver

Ioana Ciornei posted 2 patches 2 months, 1 week ago
There is a newer version of this series
[PATCH 1/2] irqchip/ls-extirq: convert to a platform driver
Posted by Ioana Ciornei 2 months, 1 week ago
Since there is no need for ls-extirq to be initialized early, convert it
to a proper platform driver. Instead of using IRQCHIP_DECLARE, add an
of_device_id array with the same compatible strings as before. Also
change the prototype and name of the probe function and adjust it to a
platform_device structure.

With this change we also have the added advantage of avoiding the
irqchip_init() -> of_irq_init() code path which imposes dt checks that
the ls-extirq does not comply with because of its improper use of the
interrupt-map property.

Fixes: 1b1f04d8271e ("of/irq: Ignore interrupt parent for nodes without interrupts")
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
 drivers/irqchip/irq-ls-extirq.c | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/drivers/irqchip/irq-ls-extirq.c b/drivers/irqchip/irq-ls-extirq.c
index 50a7b38381b9..775c22b08d81 100644
--- a/drivers/irqchip/irq-ls-extirq.c
+++ b/drivers/irqchip/irq-ls-extirq.c
@@ -168,13 +168,21 @@ ls_extirq_parse_map(struct ls_extirq_data *priv, struct device_node *node)
 	return 0;
 }
 
-static int __init
-ls_extirq_of_init(struct device_node *node, struct device_node *parent)
+static int ls_extirq_probe(struct platform_device *pdev)
 {
 	struct irq_domain *domain, *parent_domain;
+	struct device_node *node, *parent;
+	struct device *dev = &pdev->dev;
 	struct ls_extirq_data *priv;
 	int ret;
 
+	node = dev->of_node;
+	parent = of_irq_find_parent(node);
+	if (!parent) {
+		dev_err(dev, "Failed to get IRQ parent node\n");
+		return -ENODEV;
+	}
+
 	parent_domain = irq_find_host(parent);
 	if (!parent_domain) {
 		pr_err("Cannot find parent domain\n");
@@ -227,6 +235,20 @@ ls_extirq_of_init(struct device_node *node, struct device_node *parent)
 	return ret;
 }
 
-IRQCHIP_DECLARE(ls1021a_extirq, "fsl,ls1021a-extirq", ls_extirq_of_init);
-IRQCHIP_DECLARE(ls1043a_extirq, "fsl,ls1043a-extirq", ls_extirq_of_init);
-IRQCHIP_DECLARE(ls1088a_extirq, "fsl,ls1088a-extirq", ls_extirq_of_init);
+static const struct of_device_id ls_extirq_dt_ids[] = {
+	{ .compatible = "fsl,ls1021a-extirq" },
+	{ .compatible = "fsl,ls1043a-extirq" },
+	{ .compatible = "fsl,ls1088a-extirq" },
+	{}
+};
+MODULE_DEVICE_TABLE(of, ls_extirq_dt_ids);
+
+static struct platform_driver ls_extirq_driver = {
+	.probe = ls_extirq_probe,
+	.driver = {
+		.name = "ls-extirq",
+		.of_match_table = ls_extirq_dt_ids,
+	}
+};
+
+module_platform_driver(ls_extirq_driver);
-- 
2.25.1
Re: [PATCH 1/2] irqchip/ls-extirq: convert to a platform driver
Posted by Geert Uytterhoeven 2 months ago
Hi Ionana,

On Thu, 4 Dec 2025 at 18:43, Ioana Ciornei <ioana.ciornei@nxp.com> wrote:
> Since there is no need for ls-extirq to be initialized early, convert it
> to a proper platform driver. Instead of using IRQCHIP_DECLARE, add an
> of_device_id array with the same compatible strings as before. Also
> change the prototype and name of the probe function and adjust it to a
> platform_device structure.
>
> With this change we also have the added advantage of avoiding the
> irqchip_init() -> of_irq_init() code path which imposes dt checks that
> the ls-extirq does not comply with because of its improper use of the
> interrupt-map property.
>
> Fixes: 1b1f04d8271e ("of/irq: Ignore interrupt parent for nodes without interrupts")
> Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>

Thanks for your patch!

> --- a/drivers/irqchip/irq-ls-extirq.c
> +++ b/drivers/irqchip/irq-ls-extirq.c

> @@ -227,6 +235,20 @@ ls_extirq_of_init(struct device_node *node, struct device_node *parent)
>         return ret;
>  }
>
> -IRQCHIP_DECLARE(ls1021a_extirq, "fsl,ls1021a-extirq", ls_extirq_of_init);
> -IRQCHIP_DECLARE(ls1043a_extirq, "fsl,ls1043a-extirq", ls_extirq_of_init);
> -IRQCHIP_DECLARE(ls1088a_extirq, "fsl,ls1088a-extirq", ls_extirq_of_init);
> +static const struct of_device_id ls_extirq_dt_ids[] = {
> +       { .compatible = "fsl,ls1021a-extirq" },
> +       { .compatible = "fsl,ls1043a-extirq" },
> +       { .compatible = "fsl,ls1088a-extirq" },
> +       {}
> +};
> +MODULE_DEVICE_TABLE(of, ls_extirq_dt_ids);
> +
> +static struct platform_driver ls_extirq_driver = {
> +       .probe = ls_extirq_probe,
> +       .driver = {
> +               .name = "ls-extirq",
> +               .of_match_table = ls_extirq_dt_ids,
> +       }
> +};
> +
> +module_platform_driver(ls_extirq_driver);

builtin_platform_driver(), as the driver cannot be modular?

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
Re: [PATCH 1/2] irqchip/ls-extirq: convert to a platform driver
Posted by Ioana Ciornei 2 months ago
On Fri, Dec 05, 2025 at 11:28:29AM +0100, Geert Uytterhoeven wrote:
> Hi Ionana,
> 

Hi Geert,

My name is spelled Ioana.

(...)

> > +static struct platform_driver ls_extirq_driver = {
> > +       .probe = ls_extirq_probe,
> > +       .driver = {
> > +               .name = "ls-extirq",
> > +               .of_match_table = ls_extirq_dt_ids,
> > +       }
> > +};
> > +
> > +module_platform_driver(ls_extirq_driver);
> 
> builtin_platform_driver(), as the driver cannot be modular?

Sure, will fix in v2.

Thanks
Re: [PATCH 1/2] irqchip/ls-extirq: convert to a platform driver
Posted by Geert Uytterhoeven 2 months ago
Hi Ioana,

On Fri, 5 Dec 2025 at 13:14, Ioana Ciornei <ioana.ciornei@nxp.com> wrote:
> On Fri, Dec 05, 2025 at 11:28:29AM +0100, Geert Uytterhoeven wrote:
> > Hi Ionana,

> My name is spelled Ioana.

Please accept my sincere apologies!

> > > +static struct platform_driver ls_extirq_driver = {
> > > +       .probe = ls_extirq_probe,
> > > +       .driver = {
> > > +               .name = "ls-extirq",
> > > +               .of_match_table = ls_extirq_dt_ids,
> > > +       }
> > > +};
> > > +
> > > +module_platform_driver(ls_extirq_driver);
> >
> > builtin_platform_driver(), as the driver cannot be modular?
>
> Sure, will fix in v2.

Thanks!

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds