diff options
| author | Anson Huang | 2019-06-13 05:35:25 +0200 |
|---|---|---|
| committer | Shawn Guo | 2019-06-18 09:14:59 +0200 |
| commit | bbfba8c7150b37ff536bd6629a62a0321a75abdb (patch) | |
| tree | e11ea79c80dafe0ff537f35c16648962e2c9198a /arch/arm/boot | |
| parent | ARM: dts: imx6ul: Enable SNVS power key according to board design (diff) | |
| download | kernel-qcow2-linux-bbfba8c7150b37ff536bd6629a62a0321a75abdb.tar.gz kernel-qcow2-linux-bbfba8c7150b37ff536bd6629a62a0321a75abdb.tar.xz kernel-qcow2-linux-bbfba8c7150b37ff536bd6629a62a0321a75abdb.zip | |
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>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/imx6sll-evk.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6sll.dtsi | 1 |
2 files changed, 5 insertions, 0 deletions
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"; }; }; |