diff options
| author |   Marc Zyngier <maz@kernel.org> | 2022-09-29 17:21:16 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2022-09-29 17:21:16 +0100 |
| commit | 732d69c80cb04a587d9ec2935bcb63989e66eb92 (patch) | |
| tree | ad5bf703e3c9922f04ade0787fbb863188559f9c /include/linux | |
| parent | Merge branch irq/rtl-imap-deprecation into irq/irqchip-next (diff) | |
| parent | dt-bindings: irqchip: renesas,irqc: Add r8a779g0 support (diff) | |
| download | linux-dev-732d69c80cb04a587d9ec2935bcb63989e66eb92.tar.xz linux-dev-732d69c80cb04a587d9ec2935bcb63989e66eb92.zip | |
Merge branch irq/misc-6.1 into irq/irqchip-next
* irq/misc-6.1:
: .
: Misc irqchip updates for 6.1:
:
: - Allow generic irqchip support without selecting CONFIG_OF_IRQ
:
: - Fix a couple of bindings for TI interrupts controllers
:
: - Yet another binding update for a Renesas SoC
:
: - The obligatory fixes from the spelling police
: .
dt-bindings: irqchip: renesas,irqc: Add r8a779g0 support
irqchip/gic-v3: Fix typo in comment
dt-bindings: interrupt-controller: ti,sci-intr: Fix missing reg property in the binding
dt-bindings: irqchip: ti,sci-inta: Fix warning for missing #interrupt-cells
irqchip: Make irqchip_init() usable on pure ACPI systems
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/of_irq.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h index 83fccd0c9bba..d6d3eae2f145 100644 --- a/include/linux/of_irq.h +++ b/include/linux/of_irq.h @@ -37,9 +37,8 @@ extern unsigned int irq_create_of_mapping(struct of_phandle_args *irq_data); extern int of_irq_to_resource(struct device_node *dev, int index, struct resource *r); -extern void of_irq_init(const struct of_device_id *matches); - #ifdef CONFIG_OF_IRQ +extern void of_irq_init(const struct of_device_id *matches); extern int of_irq_parse_one(struct device_node *device, int index, struct of_phandle_args *out_irq); extern int of_irq_count(struct device_node *dev); @@ -57,6 +56,9 @@ extern struct irq_domain *of_msi_map_get_device_domain(struct device *dev, extern void of_msi_configure(struct device *dev, struct device_node *np); u32 of_msi_map_id(struct device *dev, struct device_node *msi_np, u32 id_in); #else +static inline void of_irq_init(const struct of_device_id *matches) +{ +} static inline int of_irq_parse_one(struct device_node *device, int index, struct of_phandle_args *out_irq) { |