From: Shengfei xu <xsf@rock-chips.com>
Date: Fri, 29 Jan 2016 10:34:56 +0000 (+0800)
Subject: ARM64: dts: rk3368-tb: the regulator-names match the hardware.
X-Git-Tag: firefly_0821_release~3441
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=67f27449b3914fc778bd45a5719897c028e0f3da;p=firefly-linux-kernel-4.4.55.git

ARM64: dts: rk3368-tb: the regulator-names match the hardware.

Change-Id: I7e5de0c05942d622e9f26743bb8c7600f1155406
Signed-off-by: Shengfei xu <xsf@rock-chips.com>
---

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-tb.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-tb.dtsi
index 4fbd96689952..0010dc0fcb71 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-tb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368-tb.dtsi
@@ -347,7 +347,7 @@
 		vcc6-supply = <&vcc_sys>;
 		vcc7-supply = <&vcc_sys>;
 		vcc8-supply = <&vcc_sys>;
-		vcc9-supply = <&vcc33_io>;
+		vcc9-supply = <&vcc_io>;
 
 		regulators {
 			vdd_logic: DCDC_REG1 {
@@ -358,7 +358,8 @@
 				regulator-max-microvolt = <1450000>;
 				regulator-ramp-delay = <6001>;
 				regulator-state-mem {
-					regulator-off-in-suspend;
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1000000>;
 				};
 			};
 
@@ -370,7 +371,7 @@
 				regulator-max-microvolt = <1250000>;
 				regulator-ramp-delay = <6001>;
 				regulator-state-mem {
-				regulator-on-in-suspend;
+					regulator-on-in-suspend;
 					regulator-suspend-microvolt = <1000000>;
 				};
 			};
@@ -384,24 +385,24 @@
 				};
 			};
 
-			vcc33_io: DCDC_REG4 {
+			vcc_io: DCDC_REG4 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <3300000>;
 				regulator-max-microvolt = <3300000>;
-				regulator-name = "vcc33_io";
+				regulator-name = "vcc_io";
 				regulator-state-mem {
-				regulator-on-in-suspend;
+					regulator-on-in-suspend;
 					regulator-suspend-microvolt = <3300000>;
 				};
 			};
 
-			vccio_pmu: LDO_REG1 {
+			vcca_codec: LDO_REG1 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <3300000>;
 				regulator-max-microvolt = <3300000>;
-				regulator-name = "vccio_pmu";
+				regulator-name = "vcca_codec";
 				regulator-state-mem {
 					regulator-on-in-suspend;
 					regulator-suspend-microvolt = <3300000>;
@@ -411,10 +412,10 @@
 			vcc_tp: LDO_REG2 {
 				regulator-always-on;
 				regulator-boot-on;
-				regulator-min-microvolt = <3300000>;
-				regulator-max-microvolt = <3300000>;
+				regulator-min-microvolt = <3000000>;
+				regulator-max-microvolt = <3000000>;
 				regulator-name = "vcc_tp";
-					regulator-state-mem {
+				regulator-state-mem {
 					regulator-off-in-suspend;
 				};
 			};
@@ -443,15 +444,15 @@
 				};
 			};
 
-			vccio_sd: LDO_REG5 {
+			vccio_pmu: LDO_REG5 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <1800000>;
-				regulator-max-microvolt = <3300000>;
-				regulator-name = "vccio_sd";
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "vccio_pmu";
 				regulator-state-mem {
 					regulator-on-in-suspend;
-					regulator-suspend-microvolt = <3300000>;
+					regulator-suspend-microvolt = <1800000>;
 				};
 			};
 
@@ -479,34 +480,34 @@
 				};
 			};
 
-			vcca_codec: LDO_REG8 {
+			vccio_wl: LDO_REG8 {
 				regulator-always-on;
 				regulator-boot-on;
-				regulator-min-microvolt = <3300000>;
+				regulator-min-microvolt = <1800000>;
 				regulator-max-microvolt = <3300000>;
-				regulator-name = "vcca_codec";
+				regulator-name = "vccio_wl";
 				regulator-state-mem {
 					regulator-on-in-suspend;
 					regulator-suspend-microvolt = <3300000>;
 				};
 			};
 
-			vcc_wl: LDO_REG9 {
+			vccio_sd: LDO_REG9 {
 				regulator-always-on;
 				regulator-boot-on;
-				regulator-min-microvolt = <3300000>;
+				regulator-min-microvolt = <1800000>;
 				regulator-max-microvolt = <3300000>;
-				regulator-name = "vcc_wl";
+				regulator-name = "vccio_sd";
 				regulator-state-mem {
 					regulator-on-in-suspend;
 					regulator-suspend-microvolt = <3300000>;
 				};
 			};
 
-			vcc_lcd: SWITCH_REG {
+			vcc_sd: SWITCH_REG {
 				regulator-always-on;
 				regulator-boot-on;
-				regulator-name = "vcc_lcd";
+				regulator-name = "vcc_sd";
 				regulator-state-mem {
 					regulator-on-in-suspend;
 				};