ARM: dts: rockchip: Use the correct regulator properties on rv1108-evb

The following properties:

- regulator-state-enabled
- regulator-state-disabled
- regulator-state-uv

are not valid ones as per
Documentation/devicetree/bindings/regulator/regulator.txt

Fix it by using the correct properties as per the dt bindings.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm/boot/dts/rv1108-evb.dts b/arch/arm/boot/dts/rv1108-evb.dts
index 203d83e3bbf57950564125a31d7a67ff332cf784..30f3d0470ad9805e6a3b61082cfcc1be83edfc2b 100644 (file)
--- a/arch/arm/boot/dts/rv1108-evb.dts
+++ b/arch/arm/boot/dts/rv1108-evb.dts
@@ -97,8 +97,8 @@ vdd_core: DCDC_REG1 {
                                regulator-always-on;
                                regulator-boot-on;
                                regulator-state-mem {
-                                       regulator-state-enabled;
-                                       regulator-state-uv = <900000>;
+                                       regulator-on-in-suspend;
+                                       regulator-suspend-microvolt = <900000>;
                                };
                        };
 
@@ -107,7 +107,7 @@ vdd_cam: DCDC_REG2 {
                                regulator-min-microvolt = <700000>;
                                regulator-max-microvolt = <2000000>;
                                regulator-state-mem {
-                                       regulator-state-disabled;
+                                       regulator-off-in-suspend;
                                };
                        };
 
@@ -116,7 +116,7 @@ vcc_ddr: DCDC_REG3 {
                                regulator-always-on;
                                regulator-boot-on;
                                regulator-state-mem {
-                                       regulator-state-enabled;
+                                       regulator-on-in-suspend;
                                };
                        };
 
@@ -127,8 +127,8 @@ vcc_io: DCDC_REG4 {
                                regulator-always-on;
                                regulator-boot-on;
                                regulator-state-mem {
-                                       regulator-state-enabled;
-                                       regulator-state-uv = <3300000>;
+                                       regulator-on-in-suspend;
+                                       regulator-suspend-microvolt = <3300000>;
                                };
                        };
 
@@ -139,7 +139,7 @@ vdd_10: LDO_REG1 {
                                regulator-always-on;
                                regulator-boot-on;
                                regulator-state-mem {
-                                       regulator-state-disabled;
+                                       regulator-off-in-suspend;
                                };
                        };
 
@@ -150,7 +150,7 @@ vcc_18: LDO_REG2 {
                                regulator-always-on;
                                regulator-boot-on;
                                regulator-state-mem {
-                                       regulator-state-disabled;
+                                       regulator-off-in-suspend;
                                };
                        };
 
@@ -161,8 +161,8 @@ vdd10_pmu: LDO_REG3 {
                                regulator-always-on;
                                regulator-boot-on;
                                regulator-state-mem {
-                                       regulator-state-enabled;
-                                       regulator-state-uv = <1000000>;
+                                       regulator-on-in-suspend;
+                                       regulator-suspend-microvolt = <1000000>;
                                };
                        };
                };