diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-10 20:45:23 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-11 00:34:43 +0100 |
| commit | 1ab056a5fb0d123436b862806734c6a9dc4651a4 (patch) | |
| tree | 507968eeb2f51528b9a5d728523157702f4feaf3 /Documentation/devicetree | |
| parent | 71b9f09697fc2ebacbc9e52079f2c6156f9b994f (diff) | |
| parent | b97ae0d6eac52b4fda9f0dd1d31c81dac4ddd572 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/gicv3' into linux-linaro-lsk
Conflicts:
drivers/irqchip/irq-gic.c
include/linux/irqchip/arm-gic.h
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/gic.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/gic.txt b/Documentation/devicetree/bindings/arm/gic.txt index 3dfb0c0384f5..535774577238 100644 --- a/Documentation/devicetree/bindings/arm/gic.txt +++ b/Documentation/devicetree/bindings/arm/gic.txt @@ -49,6 +49,11 @@ Optional regions, used when the GIC doesn't have banked registers. The offset is cpu-offset * cpu-nr. +- arm,routable-irqs : Total number of gic irq inputs which are not directly + connected from the peripherals, but are routed dynamically + by a crossbar/multiplexer preceding the GIC. The GIC irq + input line is assigned dynamically when the corresponding + peripheral's crossbar line is mapped. Example: intc: interrupt-controller@fff11000 { @@ -56,6 +61,7 @@ Example: #interrupt-cells = <3>; #address-cells = <1>; interrupt-controller; + arm,routable-irqs = <160>; reg = <0xfff11000 0x1000>, <0xfff10100 0x100>; }; |