diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-10-28 21:11:34 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-10-28 21:11:34 +0100 |
| commit | 11e45471abea1a69dc3a92b1d1632c4d628b3b98 (patch) | |
| tree | f9f69bf63094ad96f2a3d6d85d2c70bedd4928d3 | |
| parent | 5f5739d5f736614d555e8a2ec36dc4518dfa820c (diff) | |
| parent | 837d7a8fe852cf93fff1cd3b73d707b3a6ae340f (diff) | |
| download | linux-11e45471abea1a69dc3a92b1d1632c4d628b3b98.tar.gz linux-11e45471abea1a69dc3a92b1d1632c4d628b3b98.tar.bz2 linux-11e45471abea1a69dc3a92b1d1632c4d628b3b98.zip | |
Merge branch irq/misc-5.16 into irq/irqchip-next
* irq/misc-5.16:
: .
: Misc irqchip fixes for 5.16:
: - MAINTAINERS update for the ARM VIC DT binding
: - Allow drivers using the IRQCHIP_PLATFORM_DRIVER_BEGIN/END
: infrastructure to use COMPILE_TEST without CONFIG_OF
: - DT updates
: - Detangle h8300 linux/irqchip.h inclusion
: .
h8300: Fix linux/irqchip.h include mess
dt-bindings: irqchip: renesas-irqc: Document r8a774e1 bindings
irqchip: Fix compile-testing without CONFIG_OF
MAINTAINERS: update arm,vic.yaml reference
Signed-off-by: Marc Zyngier <maz@kernel.org>
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.yaml | 1 | ||||
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | arch/h8300/include/asm/irq.h | 2 | ||||
| -rw-r--r-- | arch/h8300/kernel/irq.c | 1 | ||||
| -rw-r--r-- | include/linux/irqchip.h | 5 |
5 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.yaml b/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.yaml index abb22db3bb28..79d0358e2f61 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.yaml +++ b/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.yaml @@ -27,6 +27,7 @@ properties: - renesas,intc-ex-r8a774a1 # RZ/G2M - renesas,intc-ex-r8a774b1 # RZ/G2N - renesas,intc-ex-r8a774c0 # RZ/G2E + - renesas,intc-ex-r8a774e1 # RZ/G2H - renesas,intc-ex-r8a7795 # R-Car H3 - renesas,intc-ex-r8a7796 # R-Car M3-W - renesas,intc-ex-r8a77961 # R-Car M3-W+ diff --git a/MAINTAINERS b/MAINTAINERS index 64d7e9854786..eed7668a5dd0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1551,7 +1551,7 @@ ARM PRIMECELL VIC PL190/PL192 DRIVER M: Linus Walleij <linus.walleij@linaro.org> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained -F: Documentation/devicetree/bindings/interrupt-controller/arm,vic.txt +F: Documentation/devicetree/bindings/interrupt-controller/arm,vic.yaml F: drivers/irqchip/irq-vic.c ARM SMC WATCHDOG DRIVER diff --git a/arch/h8300/include/asm/irq.h b/arch/h8300/include/asm/irq.h index 5fc5b436dde9..776cf06d7a59 100644 --- a/arch/h8300/include/asm/irq.h +++ b/arch/h8300/include/asm/irq.h @@ -2,8 +2,6 @@ #ifndef _H8300_IRQ_H_ #define _H8300_IRQ_H_ -#include <linux/irqchip.h> - #if defined(CONFIG_CPU_H8300H) #define NR_IRQS 64 #define IRQ_CHIP h8300h_irq_chip diff --git a/arch/h8300/kernel/irq.c b/arch/h8300/kernel/irq.c index 834e4d7b1bcf..8ad6d702cd0b 100644 --- a/arch/h8300/kernel/irq.c +++ b/arch/h8300/kernel/irq.c @@ -8,6 +8,7 @@ #include <linux/init.h> #include <linux/interrupt.h> #include <linux/irq.h> +#include <linux/irqchip.h> #include <linux/irqdomain.h> #include <linux/of_irq.h> #include <asm/traps.h> diff --git a/include/linux/irqchip.h b/include/linux/irqchip.h index 7f007b9c23f8..3a091d0710ae 100644 --- a/include/linux/irqchip.h +++ b/include/linux/irqchip.h @@ -48,8 +48,9 @@ static const struct of_device_id drv_name##_irqchip_match_table[] = { {}, \ }; \ MODULE_DEVICE_TABLE(of, drv_name##_irqchip_match_table); \ -static struct platform_driver drv_name##_driver = { \ - .probe = platform_irqchip_probe, \ +static struct platform_driver drv_name##_driver = { \ + .probe = IS_ENABLED(CONFIG_IRQCHIP) ? \ + platform_irqchip_probe : NULL, \ .driver = { \ .name = #drv_name, \ .owner = THIS_MODULE, \ |