| commit | 5b30ffc29d91b9b2cf2e6968f3aab60c97d15384 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Tue Dec 22 11:27:29 2015 -0800 |
| committer | Olof Johansson <olof@lixom.net> | Tue Dec 22 11:27:29 2015 -0800 |
| tree | 6a946a22e52aa1872aa1571695a445652b7bf618 | |
| parent | dd90caaca216b848e3093ebbd02bd4615de7e88b [diff] | |
| parent | bdd5739008617c594ac231b1427d23f2c9000fcd [diff] |
Merge tag 'zynqmp-dt-for-4.5' of https://github.com/Xilinx/linux-xlnx into next/dt64 arm: Xilinx ZynqMP dt patches for v4.5 - Label GPIO controller as interrupt controller * tag 'zynqmp-dt-for-4.5' of https://github.com/Xilinx/linux-xlnx: ARM64: zynqmp: DT: Add interrupt-controller property to GPIO Signed-off-by: Olof Johansson <olof@lixom.net>
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi index 857eda5..200fb58 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -133,6 +133,8 @@ clocks = <&misc_clk>; interrupt-parent = <&gic>; interrupts = <0 16 4>; + interrupt-controller; + #interrupt-cells = <2>; reg = <0x0 0xff0a0000 0x1000>; };