From 4f3e4efb38fd205c44c505242c6038f073e6ea16 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E5=BC=A0=E6=99=B4?= <zhangqing@rock-chips.com>
Date: Thu, 31 Jan 2013 19:02:44 +0800
Subject: [PATCH] rk31xx:act8846:support sleep voltage for new hardware

---
 arch/arm/mach-rk30/board-rk3168-ds1006h.c   | 12 ++++++++++++
 arch/arm/mach-rk30/board-rk3168-tb.c        | 19 +++++++++++++++++--
 arch/arm/mach-rk3188/board-rk3188-ds1006h.c | 12 ++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-rk30/board-rk3168-ds1006h.c b/arch/arm/mach-rk30/board-rk3168-ds1006h.c
index 39c88828e56a..a049a56d573c 100755
--- a/arch/arm/mach-rk30/board-rk3168-ds1006h.c
+++ b/arch/arm/mach-rk30/board-rk3168-ds1006h.c
@@ -1180,19 +1180,31 @@ static struct pmu_info  act8846_dcdc_info[] = {
 		.name          = "vdd_core",    //logic
 		.min_uv          = 1000000,
 		.max_uv         = 1000000,
+		#ifdef CONFIG_ACT8846_SUPPORT_RESET
+		.suspend_vol  =  1200000,
+		#else
 		.suspend_vol  =  900000,
+		#endif
 	},
 	{
 		.name          = "vdd_cpu",   //arm
 		.min_uv          = 1000000,
 		.max_uv         = 1000000,
+		#ifdef CONFIG_ACT8846_SUPPORT_RESET
+		.suspend_vol  =  1200000,
+		#else
 		.suspend_vol  =  900000,
+		#endif
 	},
 	{
 		.name          = "act_dcdc4",   //vccio
 		.min_uv          = 3000000,
 		.max_uv         = 3000000,
+		#ifdef CONFIG_ACT8846_SUPPORT_RESET
+		.suspend_vol  =  3000000,
+		#else
 		.suspend_vol  =  2800000,
+		#endif
 	},
 	
 };
diff --git a/arch/arm/mach-rk30/board-rk3168-tb.c b/arch/arm/mach-rk30/board-rk3168-tb.c
index b77af4b87b22..f709c23040d6 100755
--- a/arch/arm/mach-rk30/board-rk3168-tb.c
+++ b/arch/arm/mach-rk30/board-rk3168-tb.c
@@ -1576,19 +1576,34 @@ static struct pmu_info  act8846_dcdc_info[] = {
 		.name          = "vdd_core",    //logic
 		.min_uv          = 1000000,
 		.max_uv         = 1000000,
-		.suspend_vol  =  1000000,
+		#ifdef CONFIG_ACT8846_SUPPORT_RESET
+		.suspend_vol  =  1200000,
+		#else
+		.suspend_vol  =  900000,
+		#endif
+
 	},
 	{
 		.name          = "vdd_cpu",   //arm
 		.min_uv          = 1000000,
 		.max_uv         = 1000000,
-		.suspend_vol  =  1000000,
+		#ifdef CONFIG_ACT8846_SUPPORT_RESET
+		.suspend_vol  =  1200000,
+		#else
+		.suspend_vol  =  900000,
+		#endif
+
 	},
 	{
 		.name          = "act_dcdc4",   //vccio
 		.min_uv          = 3000000,
 		.max_uv         = 3000000,
+		#ifdef CONFIG_ACT8846_SUPPORT_RESET
 		.suspend_vol  =  3000000,
+		#else
+		.suspend_vol  =  2800000,
+		#endif
+
 	},
 	
 };
diff --git a/arch/arm/mach-rk3188/board-rk3188-ds1006h.c b/arch/arm/mach-rk3188/board-rk3188-ds1006h.c
index bb895a2e7058..3924bf4ba265 100755
--- a/arch/arm/mach-rk3188/board-rk3188-ds1006h.c
+++ b/arch/arm/mach-rk3188/board-rk3188-ds1006h.c
@@ -1235,19 +1235,31 @@ static struct pmu_info  act8846_dcdc_info[] = {
 		.name          = "vdd_core",    //logic
 		.min_uv          = 1000000,
 		.max_uv         = 1000000,
+		#ifdef CONFIG_ACT8846_SUPPORT_RESET
+		.suspend_vol  =  1200000,
+		#else
 		.suspend_vol  =  900000,
+		#endif
 	},
 	{
 		.name          = "vdd_cpu",   //arm
 		.min_uv          = 1000000,
 		.max_uv         = 1000000,
+		#ifdef CONFIG_ACT8846_SUPPORT_RESET
+		.suspend_vol  =  1200000,
+		#else
 		.suspend_vol  =  900000,
+		#endif
 	},
 	{
 		.name          = "act_dcdc4",   //vccio
 		.min_uv          = 3000000,
 		.max_uv         = 3000000,
+		#ifdef CONFIG_ACT8846_SUPPORT_RESET
+		.suspend_vol  =  3000000,
+		#else
 		.suspend_vol  =  2800000,
+		#endif
 	},
 	
 };
-- 
2.34.1