Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f54fe64d authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Rafael J. Wysocki
Browse files

cpufreq: loongson2: fix regression related to clock management 



Commit 42913c79 (MIPS: Loongson2: Use clk API instead of direct
dereferences) broke the cpufreq functionality on Loongson2 boards:
clk_set_rate() is called before the CPU frequency table is
initialized, and therefore will always fail.

Fix by moving the clk_set_rate() after the table initialization.
Tested on Lemote FuLoong mini-PC.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Cc: 3.9+ <stable@vger.kernel.org> # 3.9+
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent c095ba72

drivers/cpufreq/loongson2_cpufreq.c

+6 −5
Original line number Diff line number Diff line
@@ -118,11 +118,6 @@ static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy) 
		clk_put(cpuclk);

		return -EINVAL;

	}

	ret = clk_set_rate(cpuclk, rate);

	if (ret) {

		clk_put(cpuclk);

		return ret;

	}



	/* clock table init */

	for (i = 2;
@@ -130,6 +125,12 @@ static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy) 
	     i++)

		loongson2_clockmod_table[i].frequency = (rate * i) / 8;



	ret = clk_set_rate(cpuclk, rate);

	if (ret) {

		clk_put(cpuclk);

		return ret;

	}



	policy->cur = loongson2_cpufreq_get(policy->cpu);



	cpufreq_frequency_table_get_attr(&loongson2_clockmod_table[0],