From: 黄涛 <huangtao@rock-chips.com>
Date: Thu, 12 May 2011 07:40:06 +0000 (+0800)
Subject: Revert "RK29MobileSDK: Open Uart0 CLK when system in sleep;"
X-Git-Tag: firefly_0821_release~10332
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=258c18646ebf0ba92c7f3c1f601fdf718790e419;p=firefly-linux-kernel-4.4.55.git

Revert "RK29MobileSDK: Open Uart0 CLK when system in sleep;"

This reverts commit 9e3e1986b475e5d434f99669c3fc94751138665c.
Only revert arch/arm/mach-rk29/pm.c
---

diff --git a/arch/arm/mach-rk29/pm.c b/arch/arm/mach-rk29/pm.c
index 044952c3458e..3a02514ef884 100755
--- a/arch/arm/mach-rk29/pm.c
+++ b/arch/arm/mach-rk29/pm.c
@@ -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)