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 ab8e0891cea44e905312d4b85f040db383852066..9c205db1d13bf4eb7404571d015e83dabd17e903 100644 (file)
--- 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 7b9e563e45ec809ad12c7f2014d215d70f4c71a8..36bcd529911e400dfaf307118bed3f80e4fde39a 100755 (executable)
--- 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)