diff options
| author | Anson Huang | 2019-06-13 05:35:24 +0200 |
|---|---|---|
| committer | Shawn Guo | 2019-06-18 09:14:57 +0200 |
| commit | 052ce6f4de52d2df131c221205e37ba073a420df (patch) | |
| tree | d90d11392267c3061e9021506ea170feab03a68f /arch/arm/boot | |
| parent | ARM: dts: imx6sx: Enable SNVS power key according to board design (diff) | |
| download | kernel-qcow2-linux-052ce6f4de52d2df131c221205e37ba073a420df.tar.gz kernel-qcow2-linux-052ce6f4de52d2df131c221205e37ba073a420df.tar.xz kernel-qcow2-linux-052ce6f4de52d2df131c221205e37ba073a420df.zip | |
ARM: dts: imx6ul: 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/imx6ul-14x14-evk.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6ul.dtsi | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi index 9207d5d071f1..cbe61b61a212 100644 --- a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi +++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi @@ -238,6 +238,10 @@ status = "okay"; }; +&snvs_pwrkey { + status = "okay"; +}; + &tsc { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_tsc>; diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi index 91a0ced44e27..f62cedcf458a 100644 --- a/arch/arm/boot/dts/imx6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul.dtsi @@ -650,6 +650,7 @@ interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>; linux,keycode = <KEY_POWER>; wakeup-source; + status = "disabled"; }; snvs_lpgpr: snvs-lpgpr { |