From 6ed45d832f306b13b613791728d19af6124e6802 Mon Sep 17 00:00:00 2001 From: xxx Date: Wed, 19 Dec 2012 16:47:40 +0800 Subject: [PATCH] change pll resume times in pm.c --- arch/arm/mach-rk2928/pm.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) mode change 100755 => 100644 arch/arm/mach-rk2928/pm.c diff --git a/arch/arm/mach-rk2928/pm.c b/arch/arm/mach-rk2928/pm.c old mode 100755 new mode 100644 index 31b11a124a11..e524a7ca2bcd --- a/arch/arm/mach-rk2928/pm.c +++ b/arch/arm/mach-rk2928/pm.c @@ -225,13 +225,9 @@ static int pm_pll_pwr_up(u8 pll_id) //enter slowmode cru_writel(PLL_MODE_SLOW(pll_id), CRU_MODE_CON); cru_writel( CRU_W_MSK(PLL_PWR_DN_SHIFT, 0x01), PLL_CONS(pll_id, 1)); - - if(pll_id==0) { - sram_udelay(100); - } else { - udelay(100); - } - + + sram_udelay(100); + pm_pll_wait_lock(pll_id); //return form slow //cru_writel(PLL_MODE_NORM(pll_id), CRU_MODE_CON); @@ -481,6 +477,7 @@ static int rk2928_pm_enter(suspend_state_t state) cru_writel((PLL_MODE_MSK(GPLL_ID) << 16) | (PLL_MODE_MSK(GPLL_ID) & cru_mode_con), CRU_MODE_CON); //cpll + if(!(cpll_con1&(0x1<