From: 黄涛 <huangtao@rock-chips.com>
Date: Tue, 9 Oct 2012 08:46:02 +0000 (+0800)
Subject: rk30: clock: fix dump_clock for pll
X-Git-Tag: firefly_0821_release~8468
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=10f20d9a80c5b86df840b0fa23353c2216d8f684;p=firefly-linux-kernel-4.4.55.git

rk30: clock: fix dump_clock for pll
---

diff --git a/arch/arm/mach-rk30/clock_data-rk3066b.c b/arch/arm/mach-rk30/clock_data-rk3066b.c
index ab8e0891cea4..9c205db1d13b 100644
--- a/arch/arm/mach-rk30/clock_data-rk3066b.c
+++ b/arch/arm/mach-rk30/clock_data-rk3066b.c
@@ -3229,11 +3229,11 @@ static void dump_clock(struct seq_file *s, struct clk *clk, int deep, const stru
 		u32 pll_mode;
 		u32 pll_id = clk->pll->id;
 		pll_mode = cru_readl(CRU_MODE_CON)&PLL_MODE_MSK(pll_id);
-		if(pll_mode == PLL_MODE_SLOW(pll_id))
+		if (pll_mode == (PLL_MODE_SLOW(pll_id) & PLL_MODE_MSK(pll_id)))
 			seq_printf(s, "slow   ");
-		else if(pll_mode == PLL_MODE_NORM(pll_id))
+		else if (pll_mode == (PLL_MODE_NORM(pll_id) & PLL_MODE_MSK(pll_id)))
 			seq_printf(s, "normal ");
-		else if(pll_mode == PLL_MODE_DEEP(pll_id))
+		else if (pll_mode == (PLL_MODE_DEEP(pll_id) & PLL_MODE_MSK(pll_id)))
 			seq_printf(s, "deep   ");
 
 		if(cru_readl(PLL_CONS(pll_id, 3)) & PLL_BYPASS)
diff --git a/arch/arm/mach-rk30/clock_data.c b/arch/arm/mach-rk30/clock_data.c
index 7b9e563e45ec..36bcd529911e 100755
--- a/arch/arm/mach-rk30/clock_data.c
+++ b/arch/arm/mach-rk30/clock_data.c
@@ -3476,11 +3476,11 @@ static void dump_clock(struct seq_file *s, struct clk *clk, int deep,const struc
 		u32 pll_mode;
 		u32 pll_id=clk->pll->id;
 		pll_mode=cru_readl(CRU_MODE_CON)&PLL_MODE_MSK(pll_id);
-		if(pll_mode==PLL_MODE_SLOW(pll_id))
+		if (pll_mode == (PLL_MODE_SLOW(pll_id) & PLL_MODE_MSK(pll_id)))
 			seq_printf(s, "slow   ");
-		else if(pll_mode==PLL_MODE_NORM(pll_id))
+		else if (pll_mode == (PLL_MODE_NORM(pll_id) & PLL_MODE_MSK(pll_id)))
 			seq_printf(s, "normal ");
-		else if(pll_mode==PLL_MODE_DEEP(pll_id))
+		else if (pll_mode == (PLL_MODE_DEEP(pll_id) & PLL_MODE_MSK(pll_id)))
 			seq_printf(s, "deep   ");
 
 		if(cru_readl(PLL_CONS(pll_id,3)) & PLL_BYPASS)