MLK-12675 ARM: dts: imx: keep RTC enabled for software poweroff

SRTC needs to be kept enabled during system poweroff,
SNVS_LP control register bit 0 SRTC_ENV must be set
to enable RTC, for software poweroff, kernel just
read the register offset and value from dtb and write
to SNVS_LP control register to poweroff system, need
to make sure bit 0 SRTC_ENV is set to enable RTC during
system poweroff.

Previous setting did NOT enable it which will cause
RTC stop running if using software poweroff.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
[Arul: Fix merge conflicts]
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index f3a4847..8142902 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -893,8 +893,8 @@
                                        compatible = "syscon-poweroff";
                                        regmap = <&snvs>;
                                        offset = <0x38>;
-                                       value = <0x60>;
-                                       mask = <0x60>;
+                                       value = <0x61>;
+                                       mask = <0x61>;
                                        status = "disabled";
                                };
 

diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 435eadc..93da24e 100644 (file)
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -706,8 +706,8 @@
                                        compatible = "syscon-poweroff";
                                        regmap = <&snvs>;
                                        offset = <0x38>;
-                                       value = <0x60>;
-                                       mask = <0x60>;
+                                       value = <0x61>;
+                                       mask = <0x61>;
                                        status = "disabled";
                                };
                        };

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index ba8a506..66c2c7b 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -806,8 +806,8 @@
                                        compatible = "syscon-poweroff";
                                        regmap = <&snvs>;
                                        offset = <0x38>;
-                                       value = <0x60>;
-                                       mask = <0x60>;
+                                       value = <0x61>;
+                                       mask = <0x61>;
                                        status = "disabled";
                                };
 

diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 63be11a..f3cc12e 100644 (file)
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -762,8 +762,8 @@
                                        compatible = "syscon-poweroff";
                                        regmap = <&snvs>;
                                        offset = <0x38>;
-                                       value = <0x60>;
-                                       mask = <0x60>;
+                                       value = <0x61>;
+                                       mask = <0x61>;
                                        status = "disabled";
                                };
 

diff --git a/arch/arm/boot/dts/imx6ull.dtsi b/arch/arm/boot/dts/imx6ull.dtsi
index 49d6423..2544e4b 100644 (file)
--- a/arch/arm/boot/dts/imx6ull.dtsi
+++ b/arch/arm/boot/dts/imx6ull.dtsi
@@ -697,7 +697,7 @@
                                        compatible = "syscon-poweroff";
                                        regmap = <&snvs>;
                                        offset = <0x38>;
-                                       mask = <0x60>;
+                                       mask = <0x61>;
                                };
 
                                snvs_pwrkey: snvs-powerkey {

diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 2cdc8ae..a5db91b 100644 (file)
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -568,8 +568,8 @@
                                        compatible = "syscon-poweroff";
                                        regmap = <&snvs>;
                                        offset = <0x38>;
-                                       value = <0x60>;
-                                       mask = <0x60>;
+                                       value = <0x61>;
+                                       mask = <0x61>;
                                };
 
                                snvs_pwrkey: snvs-powerkey {