mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-28 09:41:41 +00:00
81 lines
3.1 KiB
Diff
81 lines
3.1 KiB
Diff
From 1d42460a49347af4d1db345197e5d1277336b312 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Jernej=20=C5=A0krabec?= <jernej.skrabec@siol.net>
|
|
Date: Sun, 30 Jul 2017 18:41:50 +0200
|
|
Subject: [PATCH] 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>
|
|
---
|
|
drivers/clk/sunxi-ng/ccu_frac.c | 4 +++-
|
|
drivers/clk/sunxi-ng/ccu_frac.h | 2 +-
|
|
drivers/clk/sunxi-ng/ccu_mult.c | 3 ++-
|
|
drivers/clk/sunxi-ng/ccu_nm.c | 3 ++-
|
|
4 files changed, 8 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/clk/sunxi-ng/ccu_frac.c b/drivers/clk/sunxi-ng/ccu_frac.c
|
|
index ff9e72dc53372..d1d168d4c4f00 100644
|
|
--- 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 7b1ee380156fa..efe2dd6bac01d 100644
|
|
--- 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 ee5e96222cb2f..12e0783caee64 100644
|
|
--- 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 c6ba866b99d3c..a32158e8f2e35 100644
|
|
--- 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);
|
|
}
|