Skip to content

Commit 11e4547

Browse files
author
Marc Zyngier
committed
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 <[email protected]>
2 parents 5f5739d + 837d7a8 commit 11e4547

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ properties:
2727
- renesas,intc-ex-r8a774a1 # RZ/G2M
2828
- renesas,intc-ex-r8a774b1 # RZ/G2N
2929
- renesas,intc-ex-r8a774c0 # RZ/G2E
30+
- renesas,intc-ex-r8a774e1 # RZ/G2H
3031
- renesas,intc-ex-r8a7795 # R-Car H3
3132
- renesas,intc-ex-r8a7796 # R-Car M3-W
3233
- renesas,intc-ex-r8a77961 # R-Car M3-W+

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1551,7 +1551,7 @@ ARM PRIMECELL VIC PL190/PL192 DRIVER
15511551
M: Linus Walleij <[email protected]>
15521552
L: [email protected] (moderated for non-subscribers)
15531553
S: Maintained
1554-
F: Documentation/devicetree/bindings/interrupt-controller/arm,vic.txt
1554+
F: Documentation/devicetree/bindings/interrupt-controller/arm,vic.yaml
15551555
F: drivers/irqchip/irq-vic.c
15561556

15571557
ARM SMC WATCHDOG DRIVER

arch/h8300/include/asm/irq.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
#ifndef _H8300_IRQ_H_
33
#define _H8300_IRQ_H_
44

5-
#include <linux/irqchip.h>
6-
75
#if defined(CONFIG_CPU_H8300H)
86
#define NR_IRQS 64
97
#define IRQ_CHIP h8300h_irq_chip

arch/h8300/kernel/irq.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <linux/init.h>
99
#include <linux/interrupt.h>
1010
#include <linux/irq.h>
11+
#include <linux/irqchip.h>
1112
#include <linux/irqdomain.h>
1213
#include <linux/of_irq.h>
1314
#include <asm/traps.h>

include/linux/irqchip.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@ static const struct of_device_id drv_name##_irqchip_match_table[] = {
4848
{}, \
4949
}; \
5050
MODULE_DEVICE_TABLE(of, drv_name##_irqchip_match_table); \
51-
static struct platform_driver drv_name##_driver = { \
52-
.probe = platform_irqchip_probe, \
51+
static struct platform_driver drv_name##_driver = { \
52+
.probe = IS_ENABLED(CONFIG_IRQCHIP) ? \
53+
platform_irqchip_probe : NULL, \
5354
.driver = { \
5455
.name = #drv_name, \
5556
.owner = THIS_MODULE, \

0 commit comments

Comments
 (0)