Commit 913c3072 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Stephen Boyd
Browse files

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: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 888ca40e
Loading
Loading
Loading
Loading
+10 −7
Original line number Diff line number Diff line
@@ -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,11 +150,9 @@ 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;
	}
	}

	if (timing) {
		req->rate = timing->rate;