Revert "RK29MobileSDK: Open Uart0 CLK when system in sleep;"
author黄涛 <huangtao@rock-chips.com>
Thu, 12 May 2011 07:40:06 +0000 (15:40 +0800)
committer黄涛 <huangtao@rock-chips.com>
Thu, 12 May 2011 07:40:06 +0000 (15:40 +0800)
This reverts commit 9e3e1986b475e5d434f99669c3fc94751138665c.
Only revert arch/arm/mach-rk29/pm.c

arch/arm/mach-rk29/pm.c

index 044952c3458e58394d916ca2dc9ca037721cef9e..3a02514ef884b7e8f34636395572ce0aa5c6f131 100755 (executable)
@@ -404,7 +404,7 @@ static int rk29_pm_enter(suspend_state_t state)
        clkgate[1] = cru_readl(CRU_CLKGATE1_CON);
        clkgate[2] = cru_readl(CRU_CLKGATE2_CON);
        clkgate[3] = cru_clkgate3_con_mirror;
-       cru_writel((~((1 << CLK_GATE_CORE)
+       cru_writel(~((1 << CLK_GATE_CORE)
                   | (1 << CLK_GATE_ACLK_CPU)
                   | (1 << CLK_GATE_ACLK_CPU2)
                   | (1 << CLK_GATE_PCLK_CPU)
@@ -416,7 +416,7 @@ static int rk29_pm_enter(suspend_state_t state)
                   | (1 << CLK_GATE_GPIO0)
                   | (1 << CLK_GATE_RTC)
                   | (1 << CLK_GATE_GRF)
-                  ) | clkgate[0])&(~(1 << CLK_GATE_UART0)), CRU_CLKGATE0_CON);
+                  ) | clkgate[0], CRU_CLKGATE0_CON);
        cru_writel(~0, CRU_CLKGATE1_CON);
        cru_writel(~((1 << CLK_GATE_GPIO1 % 32)
                   | (1 << CLK_GATE_GPIO2 % 32)