The following commit has been merged into the irq/core branch of tip:

Commit-ID:     d315c627a18249930750fe4eb2b21f3fe9b32ea4
Gitweb:        
https://git.kernel.org/tip/d315c627a18249930750fe4eb2b21f3fe9b32ea4
Author:        Andy Shevchenko <[email protected]>
AuthorDate:    Fri, 30 Oct 2020 18:59:19 +02:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Sat, 07 Nov 2020 11:33:46 +01:00

regmap: irq: Convert to use irq_domain_create_legacy()

irq_domain_create_legacy() takes a fwnode as parameter contrary to
irq_domain_add_legacy() which requires a OF node.

Switch the regmap irq domain creation to use that new function so it is not
longer limited to OF based usage.

Signed-off-by: Andy Shevchenko <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Reviewed-by: Rafael J. Wysocki <[email protected]>
Acked-by: Mark Brown <[email protected]>
Link: 
https://lore.kernel.org/r/[email protected]

---
 drivers/base/regmap/regmap-irq.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index ad5c2de..19db764 100644
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -803,13 +803,12 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle 
*fwnode,
        }
 
        if (irq_base)
-               d->domain = irq_domain_add_legacy(to_of_node(fwnode),
-                                                 chip->num_irqs, irq_base,
-                                                 0, &regmap_domain_ops, d);
+               d->domain = irq_domain_create_legacy(fwnode, chip->num_irqs,
+                                                    irq_base, 0,
+                                                    &regmap_domain_ops, d);
        else
-               d->domain = irq_domain_add_linear(to_of_node(fwnode),
-                                                 chip->num_irqs,
-                                                 &regmap_domain_ops, d);
+               d->domain = irq_domain_create_linear(fwnode, chip->num_irqs,
+                                                    &regmap_domain_ops, d);
        if (!d->domain) {
                dev_err(map->dev, "Failed to create IRQ domain\n");
                ret = -ENOMEM;

Reply via email to