Merge tag 'for-5.13-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...

[linux-2.6-microblaze.git] / include / linux / irqdomain.h

diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index 33cacc8..62a8e3d 100644 (file)
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -256,11 +256,11 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size,
                                    irq_hw_number_t hwirq_max, int direct_max,
                                    const struct irq_domain_ops *ops,
                                    void *host_data);
-struct irq_domain *irq_domain_add_simple(struct device_node *of_node,
-                                        unsigned int size,
-                                        unsigned int first_irq,
-                                        const struct irq_domain_ops *ops,
-                                        void *host_data);
+struct irq_domain *irq_domain_create_simple(struct fwnode_handle *fwnode,
+                                           unsigned int size,
+                                           unsigned int first_irq,
+                                           const struct irq_domain_ops *ops,
+                                           void *host_data);
 struct irq_domain *irq_domain_add_legacy(struct device_node *of_node,
                                         unsigned int size,
                                         unsigned int first_irq,
@@ -325,6 +325,15 @@ static inline struct irq_domain *irq_find_host(struct device_node *node)
        return d;
 }
 
+static inline struct irq_domain *irq_domain_add_simple(struct device_node *of_node,
+                                                      unsigned int size,
+                                                      unsigned int first_irq,
+                                                      const struct irq_domain_ops *ops,
+                                                      void *host_data)
+{
+       return irq_domain_create_simple(of_node_to_fwnode(of_node), size, first_irq, ops, host_data);
+}
+
 /**
  * irq_domain_add_linear() - Allocate and register a linear revmap irq_domain.
  * @of_node: pointer to interrupt controller's device tree node.
@@ -415,15 +424,6 @@ static inline unsigned int irq_linear_revmap(struct irq_domain *domain,
 extern unsigned int irq_find_mapping(struct irq_domain *host,
                                     irq_hw_number_t hwirq);
 extern unsigned int irq_create_direct_mapping(struct irq_domain *host);
-extern int irq_create_strict_mappings(struct irq_domain *domain,
-                                     unsigned int irq_base,
-                                     irq_hw_number_t hwirq_base, int count);
-
-static inline int irq_create_identity_mapping(struct irq_domain *host,
-                                             irq_hw_number_t hwirq)
-{
-       return irq_create_strict_mappings(host, hwirq, hwirq, 1);
-}
 
 extern const struct irq_domain_ops irq_domain_simple_ops;