From fcf55e4df4dcd1261f868b90f00cc2c14f6ffdb5 Mon Sep 17 00:00:00 2001
From: XiaoDong Huang <derrick.huang@rock-chips.com>
Date: Mon, 1 Apr 2019 14:11:44 +0800
Subject: [PATCH] arm64: dts: rockchip: rk1808-evb: enable vdd_log off sleep

Powerdown vccio_3v3, vdda_0v8, vcca_1v8, vdd_log in sleep mode.

Change-Id: Ifaf2b710da05415581e8361662577b7ab09a654e
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
---
 .../boot/dts/rockchip/rk1808-evb-v10.dts      |  5 ----
 arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi  | 25 ++++++++++++++++---
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts
index 5cf380828724..6cd441ce7400 100644
--- a/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts
@@ -575,11 +575,6 @@
 	status = "okay";
 };
 
-&rockchip_suspend {
-	status = "okay";
-	rockchip,sleep-debug-en = <1>;
-};
-
 &route_dsi {
 	status = "disabled";
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi
index d3eb4ca6b78c..005d5ba79c2b 100644
--- a/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi
@@ -359,7 +359,7 @@
 				regulator-initial-mode = <0x2>;
 				regulator-name = "vdd_log";
 				regulator-state-mem {
-					regulator-on-in-suspend;
+					regulator-off-in-suspend;
 					regulator-suspend-microvolt = <800000>;
 				};
 			};
@@ -407,7 +407,7 @@
 				regulator-max-microvolt = <800000>;
 				regulator-name = "vdda_0v8";
 				regulator-state-mem {
-					regulator-on-in-suspend;
+					regulator-off-in-suspend;
 					regulator-suspend-microvolt = <800000>;
 				};
 			};
@@ -446,7 +446,7 @@
 
 				regulator-name = "vcca_1v8";
 				regulator-state-mem {
-					regulator-on-in-suspend;
+					regulator-off-in-suspend;
 					regulator-suspend-microvolt = <1800000>;
 
 				};
@@ -536,6 +536,10 @@
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-name = "vccio_3v3";
+				regulator-state-mem {
+					regulator-off-in-suspend;
+					regulator-suspend-microvolt = <3300000>;
+				};
 			};
 
 		};
@@ -612,6 +616,21 @@
 	status = "okay";
 };
 
+&rockchip_suspend {
+	status = "okay";
+	rockchip,sleep-debug-en = <1>;
+
+	rockchip,sleep-mode-config = <
+		(0
+		| RKPM_SLP_ARMOFF_LOGOFF
+		| RKPM_SLP_PMU_PMUALIVE_32K
+		| RKPM_SLP_PMU_DIS_OSC
+		| RKPM_SLP_PMIC_LP
+		| RKPM_SLP_32K_EXT
+		)
+	>;
+};
+
 &saradc {
 	status = "okay";
 	vref-supply = <&vcc_1v8>;