diff options
| author | Anson Huang | 2019-06-13 05:35:23 +0200 |
|---|---|---|
| committer | Shawn Guo | 2019-06-18 09:14:54 +0200 |
| commit | ee279588ac481742f53641d1b1e9049d97d8fb90 (patch) | |
| tree | 07ed9385c752716e86d003cbf758fad014bc041a /arch/arm/boot | |
| parent | ARM: dts: imx6qdl: Enable SNVS power key according to board design (diff) | |
| download | kernel-qcow2-linux-ee279588ac481742f53641d1b1e9049d97d8fb90.tar.gz kernel-qcow2-linux-ee279588ac481742f53641d1b1e9049d97d8fb90.tar.xz kernel-qcow2-linux-ee279588ac481742f53641d1b1e9049d97d8fb90.zip | |
ARM: dts: imx6sx: 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/imx6sx-sdb-reva.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6sx-sdb.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6sx.dtsi | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6sx-sdb-reva.dts b/arch/arm/boot/dts/imx6sx-sdb-reva.dts index 5b3d6c10bd13..f1830ed387a5 100644 --- a/arch/arm/boot/dts/imx6sx-sdb-reva.dts +++ b/arch/arm/boot/dts/imx6sx-sdb-reva.dts @@ -166,3 +166,7 @@ ®_vdd2p5 { vin-supply = <&vgen6_reg>; }; + +&snvs_pwrkey { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dts index 10f6da834a80..a8ee7087af5a 100644 --- a/arch/arm/boot/dts/imx6sx-sdb.dts +++ b/arch/arm/boot/dts/imx6sx-sdb.dts @@ -153,3 +153,7 @@ /* Transceiver EN/STBY is active low on RevB board */ gpio = <&gpio4 27 GPIO_ACTIVE_LOW>; }; + +&snvs_pwrkey { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index bbdfdd8ab655..bb25add90f19 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -738,6 +738,7 @@ interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>; linux,keycode = <KEY_POWER>; wakeup-source; + status = "disabled"; }; }; |