aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/boot/dts/apm/apm-merlin.dts
diff options
context:
space:
mode:
authorDuc Dang <dhdang@apm.com>2016-02-25 13:52:52 -0800
committerDuc Dang <dhdang@apm.com>2016-02-25 17:14:00 -0800
commitedf21f271024ec6adb93c7b4e6c1dc928b6a7250 (patch)
treea7d2b666bdc2d164873c623cb31b728bdfc0c5f9 /arch/arm64/boot/dts/apm/apm-merlin.dts
parentarm64: dts: apm: Update GPIO standby controller DT node for X-Gene v2 platforms (diff)
downloadlinux-dev-edf21f271024ec6adb93c7b4e6c1dc928b6a7250.tar.xz
linux-dev-edf21f271024ec6adb93c7b4e6c1dc928b6a7250.zip
arm64: dts: apm: Update GPIO to control power-off on X-Gene v2 platforms
This patch updates gpio-keys node that supports power-off for X-Gene v2 Merlin board to adapt with new changes in xgene-gpio-sb driver (to support configuring some GPIO pins as interrupt pins). Signed-off-by: Quan Nguyen <qnguyen@apm.com> Signed-off-by: Duc Dang <dhdang@apm.com>
Diffstat (limited to 'arch/arm64/boot/dts/apm/apm-merlin.dts')
-rw-r--r--arch/arm64/boot/dts/apm/apm-merlin.dts3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/apm/apm-merlin.dts b/arch/arm64/boot/dts/apm/apm-merlin.dts
index e5ba8d5d0cae..387c6a8d0da9 100644
--- a/arch/arm64/boot/dts/apm/apm-merlin.dts
+++ b/arch/arm64/boot/dts/apm/apm-merlin.dts
@@ -30,7 +30,8 @@
label = "POWER";
linux,code = <116>;
linux,input-type = <0x1>;
- interrupts = <0x0 0x28 0x1>;
+ interrupt-parent = <&sbgpio>;
+ interrupts = <0x0 0x1>;
};
};