Merge branch 'develop' of lhh@10.10.10.201:/home/rockchip/rk2818/kernel into develop

This commit is contained in:
lhh
2010-09-16 16:45:42 +08:00

View File

@@ -574,6 +574,8 @@ static int __tcmfunc rk2818_tcm_idle(void)
scu_writel(scu_apll, SCU_APLL_CON); // powerup
scu_writel(scu_clksel0 & (~3), SCU_CLKSEL0_CON);
tcm_udelay(2, 24);
unit = 7200; /* 24m,0.3ms , 24*300*/
while (unit-- > 0) {