From: 许盛飞 Date: Fri, 12 Sep 2014 09:39:45 +0000 (+0800) Subject: rk312x: for the bug of suspend-resume X-Git-Tag: firefly_0821_release~4716 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=782dd903135e3114485cf9ad11da34710de06990;p=firefly-linux-kernel-4.4.55.git rk312x: for the bug of suspend-resume Signed-off-by: 许盛飞 --- diff --git a/arch/arm/mach-rockchip/pm-rk312x.c b/arch/arm/mach-rockchip/pm-rk312x.c index 23863a88b214..71a2892df5c5 100644 --- a/arch/arm/mach-rockchip/pm-rk312x.c +++ b/arch/arm/mach-rockchip/pm-rk312x.c @@ -919,11 +919,12 @@ void PIE_FUNC(pwm_regulator_suspend)(void) rkpm_pwm_duty2 = readl_relaxed(RK_PWM_VIRT + 0x28); writel_relaxed(PWM_VOLTAGE, RK_PWM_VIRT + 0x28); } + rkpm_udelay(30); } void PIE_FUNC(pwm_regulator_resume)(void) { - cru_writel(0x1e000000, 0xf0); + rkpm_udelay(30); if (rkpm_chk_sram_ctrbit(RKPM_CTR_VOL_PWM0)) writel_relaxed(rkpm_pwm_duty0, RK_PWM_VIRT + 0x08); @@ -932,6 +933,7 @@ void PIE_FUNC(pwm_regulator_resume)(void) if (rkpm_chk_sram_ctrbit(RKPM_CTR_VOL_PWM2)) writel_relaxed(rkpm_pwm_duty2, RK_PWM_VIRT + 0x28); + rkpm_udelay(30); } static void reg_pread(void)