From 93db055d418386174347ca52ea4728c6ae2e00aa Mon Sep 17 00:00:00 2001 From: Frank Li Date: Wed, 27 May 2015 00:26:02 +0800 Subject: ARM: dts: imx6sx: enable snvs power key enable snvs ONOFF power key support Signed-off-by: Frank Li Signed-off-by: Shawn Guo --- arch/arm/boot/dts/imx6sx.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'arch/arm/boot/dts/imx6sx.dtsi') diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index 708175d59b9c..f0602c5c3ac6 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -8,6 +8,7 @@ #include #include +#include #include #include "imx6sx-pinfunc.h" #include "skeleton.dtsi" @@ -678,6 +679,14 @@ reg = <0x38 0x4>; status = "disabled"; }; + + snvs_pwrkey: snvs-powerkey { + compatible = "fsl,sec-v4.0-pwrkey"; + regmap = <&snvs>; + interrupts = ; + linux,keycode = ; + wakeup; + }; }; epit1: epit@020d0000 { -- cgit v1.2.1 From 95d739b5ca6dc42206a9b4c0a2005f6e2170c62a Mon Sep 17 00:00:00 2001 From: Frank Li Date: Wed, 27 May 2015 00:25:59 +0800 Subject: ARM: dts: imx: update snvs to use syscon access register snvs is MFP device. Change dts to use syscon to allocate register resource. snvs power off also switch to common syscon-poweroff Signed-off-by: Frank Li Signed-off-by: Shawn Guo --- arch/arm/boot/dts/imx6sx.dtsi | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'arch/arm/boot/dts/imx6sx.dtsi') diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index f0602c5c3ac6..e391d636f18e 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -663,20 +663,21 @@ }; snvs: snvs@020cc000 { - compatible = "fsl,sec-v4.0-mon", "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; - ranges = <0 0x020cc000 0x4000>; + compatible = "fsl,sec-v4.0-mon", "syscon", "simple-mfd"; + reg = <0x020cc000 0x4000>; - snvs_rtc: snvs-rtc-lp@34 { + snvs_rtc: snvs-rtc-lp { compatible = "fsl,sec-v4.0-mon-rtc-lp"; - reg = <0x34 0x58>; + regmap = <&snvs>; + offset = <0x34>; interrupts = , ; }; - snvs_poweroff: snvs-poweroff@38 { - compatible = "fsl,sec-v4.0-poweroff"; - reg = <0x38 0x4>; + snvs_poweroff: snvs-poweroff { + compatible = "syscon-poweroff"; + regmap = <&snvs>; + offset = <0x38>; + mask = <0x60>; status = "disabled"; }; -- cgit v1.2.1 From 461aa6d723ef7bfd0dcc44676976711e2c3445c6 Mon Sep 17 00:00:00 2001 From: Anson Huang Date: Wed, 5 Aug 2015 21:57:55 +0800 Subject: ARM: dts: imx6sx: correct property name for wakeup source Commit(def56bb input: snvs_pwrkey: use "wakeup-source" as deivce tree property name) replaces the property name of "wakeup" with "wakeup-source", update this change in i.MX6SX dtsi accordingly. Signed-off-by: Anson Huang Signed-off-by: Shawn Guo --- arch/arm/boot/dts/imx6sx.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/boot/dts/imx6sx.dtsi') diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index e391d636f18e..dc7eaaefe01a 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -686,7 +686,7 @@ regmap = <&snvs>; interrupts = ; linux,keycode = ; - wakeup; + wakeup-source; }; }; -- cgit v1.2.1