clk: tegra: emc: Fix EMC max-rate clamping

When a clk user requests rate that is higher than the maximum possible,
the rate shall be clamped to the maximum and not to the current value.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/tegra/clk-emc.c b/drivers/clk/tegra/clk-emc.c
index 28068584ff6ed183b2b324286a6f0ebd3963ffcb..9a01792359396409fd4d537b2dacdd6c84aba54a 100644 (file)
--- a/drivers/clk/tegra/clk-emc.c
+++ b/drivers/clk/tegra/clk-emc.c
@@ -121,7 +121,7 @@ static int emc_determine_rate(struct clk_hw *hw, struct clk_rate_request *req)
        struct tegra_clk_emc *tegra;
        u8 ram_code = tegra_read_ram_code();
        struct emc_timing *timing = NULL;
-       int i, k;
+       int i, k, t;
 
        tegra = container_of(hw, struct tegra_clk_emc, hw);
 
@@ -130,12 +130,17 @@ static int emc_determine_rate(struct clk_hw *hw, struct clk_rate_request *req)
                        break;
        }
 
-       for (i = k; i < tegra->num_timings; i++) {
-               if (tegra->timings[i].ram_code != ram_code)
+       for (t = k; t < tegra->num_timings; t++) {
+               if (tegra->timings[t].ram_code != ram_code)
                        break;
+       }
 
+       for (i = k; i < t; i++) {
                timing = tegra->timings + i;
 
+               if (timing->rate < req->rate && i != t - 1)
+                       continue;
+
                if (timing->rate > req->max_rate) {
                        i = max(i, k + 1);
                        req->rate = tegra->timings[i - 1].rate;
@@ -145,10 +150,8 @@ static int emc_determine_rate(struct clk_hw *hw, struct clk_rate_request *req)
                if (timing->rate < req->min_rate)
                        continue;
 
-               if (timing->rate >= req->rate) {
-                       req->rate = timing->rate;
-                       return 0;
-               }
+               req->rate = timing->rate;
+               return 0;
        }
 
        if (timing) {