diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-12-29 10:25:20 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-12-29 10:25:20 +0100 |
| commit | 5c4acd97e812de908cda97e2da02dead261915fa (patch) | |
| tree | 46766bf1f7d6200892fbb2cbdf66d9b90a179978 /Documentation | |
| parent | 92b86f92ed0307efbaea3c0e95520551848d3995 (diff) | |
| parent | d8e81cbd80121e6d06dc84076701c603324dd28a (diff) | |
Merge tag 'irqchip-core-v4.5' of git://git.infradead.org/users/jcooper/linux into irq/core
Pull irqchip core changes for v4.5 from Jason Cooper:
- renesas-intc-irqpin: Remove platform code, improve clock handling
- sunxi-nmi: Extend NMI support to include A80
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/allwinner,sunxi-nmi.txt (renamed from Documentation/devicetree/bindings/interrupt-controller/allwinner,sun67i-sc-nmi.txt) | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun67i-sc-nmi.txt b/Documentation/devicetree/bindings/interrupt-controller/allwinner,sunxi-nmi.txt index d1c5cdabc3e0..81cd3692405e 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun67i-sc-nmi.txt +++ b/Documentation/devicetree/bindings/interrupt-controller/allwinner,sunxi-nmi.txt @@ -4,7 +4,7 @@ Allwinner Sunxi NMI Controller Required properties: - compatible : should be "allwinner,sun7i-a20-sc-nmi" or - "allwinner,sun6i-a31-sc-nmi" + "allwinner,sun6i-a31-sc-nmi" or "allwinner,sun9i-a80-nmi" - reg : Specifies base physical address and size of the registers. - interrupt-controller : Identifies the node as an interrupt controller - #interrupt-cells : Specifies the number of cells needed to encode an |