clk: sunxi-ng: Wait for lock when using fractional mode

Currently ccu_frac_helper_set_rate() doesn't wait for a lock bit to be
set before returning. Because of that, unstable clock may be used.

Add a wait for lock in the helper function.

Fixes: 89a3dfb78707 ("clk: sunxi-ng: Add fractional lib")
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Chen-Yu Tsai <wens@csie.org>

diff --git a/drivers/clk/sunxi-ng/ccu_frac.c b/drivers/clk/sunxi-ng/ccu_frac.c
index ff9e72dc533729718ea15a2231bc1dba48ad1839..d1d168d4c4f00b2de8e30d1a9dc532e7fecc4578 100644 (file)
--- a/drivers/clk/sunxi-ng/ccu_frac.c
+++ b/drivers/clk/sunxi-ng/ccu_frac.c
@@ -85,7 +85,7 @@ unsigned long ccu_frac_helper_read_rate(struct ccu_common *common,
 
 int ccu_frac_helper_set_rate(struct ccu_common *common,
                             struct ccu_frac_internal *cf,
-                            unsigned long rate)
+                            unsigned long rate, u32 lock)
 {
        unsigned long flags;
        u32 reg, sel;
@@ -106,5 +106,7 @@ int ccu_frac_helper_set_rate(struct ccu_common *common,
        writel(reg | sel, common->base + common->reg);
        spin_unlock_irqrestore(common->lock, flags);
 
+       ccu_helper_wait_for_lock(common, lock);
+
        return 0;
 }

diff --git a/drivers/clk/sunxi-ng/ccu_frac.h b/drivers/clk/sunxi-ng/ccu_frac.h
index 7b1ee380156fa253b92bfbda098fe0f15b3050b5..efe2dd6bac01d6c7c788061c75164b14728b29e6 100644 (file)
--- a/drivers/clk/sunxi-ng/ccu_frac.h
+++ b/drivers/clk/sunxi-ng/ccu_frac.h
@@ -48,6 +48,6 @@ unsigned long ccu_frac_helper_read_rate(struct ccu_common *common,
 
 int ccu_frac_helper_set_rate(struct ccu_common *common,
                             struct ccu_frac_internal *cf,
-                            unsigned long rate);
+                            unsigned long rate, u32 lock);
 
 #endif /* _CCU_FRAC_H_ */

diff --git a/drivers/clk/sunxi-ng/ccu_mult.c b/drivers/clk/sunxi-ng/ccu_mult.c
index ee5e96222cb2f1d9240966fbde7a62b3ab2ada72..12e0783caee64332ddc335c67d3928d0caca8b14 100644 (file)
--- a/drivers/clk/sunxi-ng/ccu_mult.c
+++ b/drivers/clk/sunxi-ng/ccu_mult.c
@@ -114,7 +114,8 @@ static int ccu_mult_set_rate(struct clk_hw *hw, unsigned long rate,
        if (ccu_frac_helper_has_rate(&cm->common, &cm->frac, rate)) {
                ccu_frac_helper_enable(&cm->common, &cm->frac);
 
-               return ccu_frac_helper_set_rate(&cm->common, &cm->frac, rate);
+               return ccu_frac_helper_set_rate(&cm->common, &cm->frac,
+                                               rate, cm->lock);
        } else {
                ccu_frac_helper_disable(&cm->common, &cm->frac);
        }

diff --git a/drivers/clk/sunxi-ng/ccu_nm.c b/drivers/clk/sunxi-ng/ccu_nm.c
index c6ba866b99d3c0078bb5c25a337fc9ca9e4abf35..a32158e8f2e35a4fa89d5d21111e11e17a518ee8 100644 (file)
--- a/drivers/clk/sunxi-ng/ccu_nm.c
+++ b/drivers/clk/sunxi-ng/ccu_nm.c
@@ -129,7 +129,8 @@ static int ccu_nm_set_rate(struct clk_hw *hw, unsigned long rate,
 
                ccu_frac_helper_enable(&nm->common, &nm->frac);
 
-               return ccu_frac_helper_set_rate(&nm->common, &nm->frac, rate);
+               return ccu_frac_helper_set_rate(&nm->common, &nm->frac,
+                                               rate, nm->lock);
        } else {
                ccu_frac_helper_disable(&nm->common, &nm->frac);
        }