clk: meson: clk-pll: fix initializing the old rate (fallback) for a PLL
authorMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Sat, 26 Dec 2020 12:15:54 +0000 (13:15 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 4 Mar 2021 09:26:26 +0000 (10:26 +0100)
[ Upstream commit 2f290b7c67adf6459a17a4c978102af35cd62e4a ]

The "rate" parameter in meson_clk_pll_set_rate() contains the new rate.
Retrieve the old rate with clk_hw_get_rate() so we don't inifinitely try
to switch from the new rate to the same rate again.

Fixes: 7a29a869434e8b ("clk: meson: Add support for Meson clock controller")
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Link: https://lore.kernel.org/r/20201226121556.975418-2-martin.blumenstingl@googlemail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/clk/meson/clk-pll.c

index 3a5853ca98c6c008eeaedaf88652310dc08b65c4..fb0bc8c0ad4d4549873789b488d1b61b98d91dfd 100644 (file)
@@ -369,7 +369,7 @@ static int meson_clk_pll_set_rate(struct clk_hw *hw, unsigned long rate,
        if (parent_rate == 0 || rate == 0)
                return -EINVAL;
 
-       old_rate = rate;
+       old_rate = clk_hw_get_rate(hw);
 
        ret = meson_clk_get_pll_settings(rate, parent_rate, &m, &n, pll);
        if (ret)