aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Zhong <zyw@rock-chips.com>2015-02-09 08:12:22 -0500
committerHeiko Stuebner <heiko@sntech.de>2015-03-11 17:40:59 -0400
commitaefc7c7512455c26574ae7118429920dc3de60ae (patch)
tree7add9a7ac1299ea35a487bd6a8428e272f98e658
parentbd76d73836fa903d67eaabcb3a0201d2d0a73461 (diff)
ARM: rockchip: decrease the wait time for resume
The register-default delay time for wait the 24MHz OSC stabilization as well as PMU stabilization is 750ms, let's decrease them to a still safe 30ms. Signed-off-by: Chris Zhong <zyw@rock-chips.com> Reviewed-by: Doug Anderson <dianders@chromium.org> Tested-by: Doug Anderson <dianders@chromium.org> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
-rw-r--r--arch/arm/mach-rockchip/pm.c3
-rw-r--r--arch/arm/mach-rockchip/pm.h4
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-rockchip/pm.c b/arch/arm/mach-rockchip/pm.c
index 50cb781aaa36..a3ab3979923c 100644
--- a/arch/arm/mach-rockchip/pm.c
+++ b/arch/arm/mach-rockchip/pm.c
@@ -209,6 +209,9 @@ static int rk3288_suspend_init(struct device_node *np)
209 memcpy(rk3288_bootram_base, rockchip_slp_cpu_resume, 209 memcpy(rk3288_bootram_base, rockchip_slp_cpu_resume,
210 rk3288_bootram_sz); 210 rk3288_bootram_sz);
211 211
212 regmap_write(pmu_regmap, RK3288_PMU_OSC_CNT, OSC_STABL_CNT_THRESH);
213 regmap_write(pmu_regmap, RK3288_PMU_STABL_CNT, PMU_STABL_CNT_THRESH);
214
212 return 0; 215 return 0;
213} 216}
214 217
diff --git a/arch/arm/mach-rockchip/pm.h b/arch/arm/mach-rockchip/pm.h
index 7c889c04604b..91a542df5791 100644
--- a/arch/arm/mach-rockchip/pm.h
+++ b/arch/arm/mach-rockchip/pm.h
@@ -63,6 +63,10 @@ static inline void rockchip_suspend_init(void)
63/* PMU_WAKEUP_CFG1 bits */ 63/* PMU_WAKEUP_CFG1 bits */
64#define PMU_ARMINT_WAKEUP_EN BIT(0) 64#define PMU_ARMINT_WAKEUP_EN BIT(0)
65 65
66/* wait 30ms for OSC stable and 30ms for pmic stable */
67#define OSC_STABL_CNT_THRESH (32 * 30)
68#define PMU_STABL_CNT_THRESH (32 * 30)
69
66enum rk3288_pwr_mode_con { 70enum rk3288_pwr_mode_con {
67 PMU_PWR_MODE_EN = 0, 71 PMU_PWR_MODE_EN = 0,
68 PMU_CLK_CORE_SRC_GATE_EN, 72 PMU_CLK_CORE_SRC_GATE_EN,