rk31xx:act8846:support sleep voltage for new hardware

diff --git a/arch/arm/mach-rk30/board-rk3168-ds1006h.c b/arch/arm/mach-rk30/board-rk3168-ds1006h.c
index 39c88828e56ace2c67ddf097d02fb6ad4add55bc..a049a56d573ce4a325893004384a4984991a993b 100755 (executable)
--- 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 b77af4b87b22db6777bcc073f4d4f9a9d1665801..f709c23040d67c6e261e1c46888b5205b4f116bf 100755 (executable)
--- 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 bb895a2e7058866dc9fea5ebdf07a6c7e1ad6f99..3924bf4ba265e30f910c17310f2cc572bb9b8647 100755 (executable)
--- 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
        },
        
 };