diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-02-29 23:36:51 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-02-29 23:36:51 (GMT) |
| commit | 1c268a8911359e4c62896e4c80970019b83aa477 (patch) | |
| tree | 546871d82a7b116f30922962456156e823ed5627 /arch/arm64/boot/dts/apm/apm-storm.dtsi | |
| parent | 047b2f6d7b773f9ae62780d444371117f5995e8f (diff) | |
| parent | edf21f271024ec6adb93c7b4e6c1dc928b6a7250 (diff) | |
| download | linux-1c268a8911359e4c62896e4c80970019b83aa477.tar.xz | |
Merge tag 'xgene-dts-for-v4.6-part1' of https://github.com/AppliedMicro/xgene-next into next/dt64
Merge "First part of X-Gene DT changes queued for v4.6" from Duc Dang:
This patch set includes:
+ A change in compatible string of X-Gene v2 SoC
PLL DT node to reflect the v2 hardware
+ Update DT fields for X-Gene v1 and v2 standby
GPIO controllers
+ Update declaration of power button GPIO for
X-Gene v1 and X-Gene v2 platforms
* tag 'xgene-dts-for-v4.6-part1' of https://github.com/AppliedMicro/xgene-next:
arm64: dts: apm: Update GPIO to control power-off on X-Gene v2 platforms
arm64: dts: apm: Update GPIO standby controller DT node for X-Gene v2 platforms
arm64: dts: apm: Update GPIO to control power-off on X-Gene v1 platforms
arm64: dts: apm: Update X-Gene standby GPIO controller DTS entries
arm64: dts: apm: Update Merlin DT PCP PLL clock node for v2 hardware
Diffstat (limited to 'arch/arm64/boot/dts/apm/apm-storm.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/apm/apm-storm.dtsi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/apm/apm-storm.dtsi b/arch/arm64/boot/dts/apm/apm-storm.dtsi index fe30f76..0f733da 100644 --- a/arch/arm64/boot/dts/apm/apm-storm.dtsi +++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi @@ -883,6 +883,9 @@ <0x0 0x2b 0x1>, <0x0 0x2c 0x1>, <0x0 0x2d 0x1>; + interrupt-parent = <&gic>; + #interrupt-cells = <2>; + interrupt-controller; }; rtc: rtc@10510000 { |