aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/interrupt-controller
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2014-01-14 23:23:00 (GMT)
committerKevin Hilman <khilman@linaro.org>2014-01-14 23:25:32 (GMT)
commit3e0a79695cf8600322c519b33df76b8bc2f1aaca (patch)
tree322c96e36f819368150ccfc154f97f353abf6948 /Documentation/devicetree/bindings/interrupt-controller
parenteb90217750136e4712f1d87a33e1951b80a1a365 (diff)
parent75cac6abe756fde529a000e725dceed2b908f61a (diff)
Merge tag 'sunxi-core-for-3.14-2' of https://github.com/mripard/linux into next/soc
From Maxime Ripard: Second round of core additions for the Allwinner SoCs Fixes to select missing configuration options, and update of the maintainer file. * tag 'sunxi-core-for-3.14-2' of https://github.com/mripard/linux: ARM: sunxi: select ARM_PSCI MAINTAINERS: Update Allwinner sunXi maintainer files ARM: sunxi: Select RESET_CONTROLLER ARM: sun6i: Add SMP support for the Allwinner A31 dt-bindings: fix example of allwinner interrupt controller ARM: sunxi: Register the A31 reset IP in init_time ARM: sunxi: Select ARCH_HAS_RESET_CONTROLLER reset: Add Allwinner SoCs Reset Controller Driver Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'Documentation/devicetree/bindings/interrupt-controller')
-rw-r--r--Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt b/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt
index 3d3b2b9..32cec4b 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt
@@ -14,5 +14,5 @@ intc: interrupt-controller {
compatible = "allwinner,sun4i-ic";
reg = <0x01c20400 0x400>;
interrupt-controller;
- #interrupt-cells = <2>;
+ #interrupt-cells = <1>;
};

Privacy Policy