Merge tag 'pinctrl-v5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[linux.git] / kernel / irq / irqdomain.c

diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 3078d0e48bbaab3e75efb4134e1697db26baaac5..132672b74e4b6784ac9f3c21c004c0d71b628b63 100644 (file)
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -31,7 +31,7 @@ struct irqchip_fwid {
        struct fwnode_handle    fwnode;
        unsigned int            type;
        char                    *name;
-       void *data;
+       phys_addr_t             *pa;
 };
 
 #ifdef CONFIG_GENERIC_IRQ_DEBUGFS
@@ -62,7 +62,8 @@ EXPORT_SYMBOL_GPL(irqchip_fwnode_ops);
  * domain struct.
  */
 struct fwnode_handle *__irq_domain_alloc_fwnode(unsigned int type, int id,
-                                               const char *name, void *data)
+                                               const char *name,
+                                               phys_addr_t *pa)
 {
        struct irqchip_fwid *fwid;
        char *n;
@@ -77,7 +78,7 @@ struct fwnode_handle *__irq_domain_alloc_fwnode(unsigned int type, int id,
                n = kasprintf(GFP_KERNEL, "%s-%d", name, id);
                break;
        default:
-               n = kasprintf(GFP_KERNEL, "irqchip@%p", data);
+               n = kasprintf(GFP_KERNEL, "irqchip@%pa", pa);
                break;
        }
 
@@ -89,7 +90,7 @@ struct fwnode_handle *__irq_domain_alloc_fwnode(unsigned int type, int id,
 
        fwid->type = type;
        fwid->name = n;
-       fwid->data = data;
+       fwid->pa = pa;
        fwid->fwnode.ops = &irqchip_fwnode_ops;
        return &fwid->fwnode;
 }
@@ -148,6 +149,7 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size,
                switch (fwid->type) {
                case IRQCHIP_FWNODE_NAMED:
                case IRQCHIP_FWNODE_NAMED_ID:
+                       domain->fwnode = fwnode;
                        domain->name = kstrdup(fwid->name, GFP_KERNEL);
                        if (!domain->name) {
                                kfree(domain);