From: Anson Huang <Anson.Huang@nxp.com>
Date: Thu, 13 Jun 2019 03:35:25 +0000 (+0800)
Subject: ARM: dts: imx6sll: Enable SNVS power key according to board design
X-Git-Tag: Ubuntu-5.13.0-19.19~8045^2~15^2~10
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=bbfba8c7150b37ff536bd6629a62a0321a75abdb;p=mirror_ubuntu-jammy-kernel.git

ARM: dts: imx6sll: 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>
---

diff --git a/arch/arm/boot/dts/imx6sll-evk.dts b/arch/arm/boot/dts/imx6sll-evk.dts
index 78809ea742c8..61aa074af19d 100644
--- a/arch/arm/boot/dts/imx6sll-evk.dts
+++ b/arch/arm/boot/dts/imx6sll-evk.dts
@@ -269,6 +269,10 @@
 	vin-supply = <&sw2_reg>;
 };
 
+&snvs_pwrkey {
+	status = "okay";
+};
+
 &uart1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_uart1>;
diff --git a/arch/arm/boot/dts/imx6sll.dtsi b/arch/arm/boot/dts/imx6sll.dtsi
index 1b4899f0fcde..438402326b02 100644
--- a/arch/arm/boot/dts/imx6sll.dtsi
+++ b/arch/arm/boot/dts/imx6sll.dtsi
@@ -576,6 +576,7 @@
 					interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
 					linux,keycode = <KEY_POWER>;
 					wakeup-source;
+					status = "disabled";
 				};
 			};