clk: zynqmp: move zynqmp_pll_set_mode out of round_rate callback

[ Upstream commit d7fd3f9f53df8bb2212dff70f66f12cae0e1a653 ]

The round_rate callback should only perform rate calculation and not
involve calling zynqmp_pll_set_mode to change the pll mode. So let's
move zynqmp_pll_set_mode out of round_rate and to set_rate callback.

Fixes: 3fde0e16d016 ("drivers: clk: Add ZynqMP clock driver")
Reported-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com>
Link: https://lore.kernel.org/r/20210406154015.602779-1-quanyang.wang@windriver.com
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/clk/zynqmp/pll.c b/drivers/clk/zynqmp/pll.c
index a541397a172c86705d9cc0886e4206f91019872f..18fee827602ab40c9a33ec6b87b71f02372bdbf8 100644 (file)
--- a/drivers/clk/zynqmp/pll.c
+++ b/drivers/clk/zynqmp/pll.c
@@ -103,9 +103,7 @@ static long zynqmp_pll_round_rate(struct clk_hw *hw, unsigned long rate,
        /* Enable the fractional mode if needed */
        rate_div = (rate * FRAC_DIV) / *prate;
        f = rate_div % FRAC_DIV;
-       zynqmp_pll_set_mode(hw, !!f);
-
-       if (zynqmp_pll_get_mode(hw) == PLL_MODE_FRAC) {
+       if (f) {
                if (rate > PS_PLL_VCO_MAX) {
                        fbdiv = rate / PS_PLL_VCO_MAX;
                        rate = rate / (fbdiv + 1);
@@ -179,10 +177,12 @@ static int zynqmp_pll_set_rate(struct clk_hw *hw, unsigned long rate,
        int ret;
        const struct zynqmp_eemi_ops *eemi_ops = zynqmp_pm_get_eemi_ops();
 
-       if (zynqmp_pll_get_mode(hw) == PLL_MODE_FRAC) {
-               rate_div = (rate * FRAC_DIV) / parent_rate;
+       rate_div = (rate * FRAC_DIV) / parent_rate;
+       f = rate_div % FRAC_DIV;
+       zynqmp_pll_set_mode(hw, !!f);
+
+       if (f) {
                m = rate_div / FRAC_DIV;
-               f = rate_div % FRAC_DIV;
                m = clamp_t(u32, m, (PLL_FBDIV_MIN), (PLL_FBDIV_MAX));
                rate = parent_rate * m;
                frac = (parent_rate * f) / FRAC_DIV;