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>
This commit is contained in:
commit
11e45471ab
|
@ -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+
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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, \
|
||||
|
|
Loading…
Reference in New Issue