ARM: dts: imx: update snvs to use syscon access register
authorFrank Li <Frank.Li@freescale.com>
Tue, 26 May 2015 16:25:59 +0000 (00:25 +0800)
committerShawn Guo <shawnguo@kernel.org>
Tue, 11 Aug 2015 15:15:17 +0000 (23:15 +0800)
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 <Frank.Li@freescale.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm/boot/dts/imx6qdl.dtsi
arch/arm/boot/dts/imx6sl.dtsi
arch/arm/boot/dts/imx6sx.dtsi
arch/arm/boot/dts/vfxxx.dtsi

index ceba982983d5c7d7b545ad8fee9fb49eaa42f326..03858d7d40642c9673075c6c61ce2c77be4db4ac 100644 (file)
                                fsl,anatop = <&anatop>;
                        };
 
-                       snvs@020cc000 {
-                               compatible = "fsl,sec-v4.0-mon", "simple-bus";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               ranges = <0 0x020cc000 0x4000>;
+                       snvs: snvs@020cc000 {
+                               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 = <0 19 IRQ_TYPE_LEVEL_HIGH>,
                                                     <0 20 IRQ_TYPE_LEVEL_HIGH>;
                                };
 
-                               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";
                                };
                        };
index a78e715e3982f7f821d01f386cc592e046e172f5..320a27f8889edc4e70ea215bbd54c5234fc2e771 100644 (file)
                                fsl,anatop = <&anatop>;
                        };
 
-                       snvs@020cc000 {
-                               compatible = "fsl,sec-v4.0-mon", "simple-bus";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               ranges = <0 0x020cc000 0x4000>;
+                       snvs: snvs@020cc000 {
+                               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 = <0 19 IRQ_TYPE_LEVEL_HIGH>,
                                                     <0 20 IRQ_TYPE_LEVEL_HIGH>;
                                };
 
-                               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";
                                };
                        };
index f0602c5c3ac657d68d699575a1d3f7091ce59903..e391d636f18ed3c3cfe301b29097080cf3557a0b 100644 (file)
                        };
 
                        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 = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
                                };
 
-                               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";
                                };
 
index 81a4d9aadebb9837c7c51c5c0ef0f1f87c491007..d4f48dbaab7bc6c59484bc72d9b353cc15ec17ed 100644 (file)
                        };
 
                        snvs0: snvs@400a7000 {
-                           compatible = "fsl,sec-v4.0-mon", "simple-bus";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               ranges = <0 0x400a7000 0x2000>;
+                           compatible = "fsl,sec-v4.0-mon", "syscon", "simple-mfd";
+                               reg = <0x400a7000 0x2000>;
 
-                               snvsrtc: snvs-rtc-lp@34 {
+                               snvsrtc: snvs-rtc-lp {
                                        compatible = "fsl,sec-v4.0-mon-rtc-lp";
-                                       reg = <0x34 0x58>;
+                                       regmap = <&snvs0>;
+                                       offset = <0x34>;
                                        interrupts = <100 IRQ_TYPE_LEVEL_HIGH>;
                                        clocks = <&clks VF610_CLK_SNVS>;
                                        clock-names = "snvs-rtc";