aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnson Huang <Anson.Huang@nxp.com>2019-06-13 11:35:26 +0800
committerShawn Guo <shawnguo@kernel.org>2019-06-18 15:15:02 +0800
commit4664179fe67970ff834e55d937a79e96d84e24a7 (patch)
tree02df54c23faeb9031a5078c721cc2fb3beccbfe2
parentARM: dts: imx6sll: Enable SNVS power key according to board design (diff)
downloadlinux-dev-4664179fe67970ff834e55d937a79e96d84e24a7.tar.xz
linux-dev-4664179fe67970ff834e55d937a79e96d84e24a7.zip
ARM: dts: imx7s: Enable SNVS power key according to board design
The SNVS power key depends on board design, by default it should be disabled in SoC DT and ONLY be enabled on board DT if it is wired up. Signed-off-by: Anson Huang <Anson.Huang@nxp.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
-rw-r--r--arch/arm/boot/dts/imx7d-sdb.dts4
-rw-r--r--arch/arm/boot/dts/imx7s.dtsi1
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts
index a5365b869485..869efbc4af42 100644
--- a/arch/arm/boot/dts/imx7d-sdb.dts
+++ b/arch/arm/boot/dts/imx7d-sdb.dts
@@ -387,6 +387,10 @@
vin-supply = <&sw2_reg>;
};
+&snvs_pwrkey {
+ status = "okay";
+};
+
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart1>;
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 5b8292670b4b..c1a4fff5ceda 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -613,6 +613,7 @@
interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
linux,keycode = <KEY_POWER>;
wakeup-source;
+ status = "disabled";
};
};