OSDN Git Service

MIPS: loongson2_cpufreq: Fix CPU clock rate setting mismerge
authorAaro Koskinen <aaro.koskinen@iki.fi>
Sun, 21 Sep 2014 12:38:43 +0000 (15:38 +0300)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 22 Oct 2014 17:10:42 +0000 (19:10 +0200)
commitaa08ed55442ac6f9810c055e1474be34e785e556
tree81f592d7cb592b101a8400995d9e5e9de737ce31
parent5a1e73ffe57a86a196c08dffcbd9866776594a38
MIPS: loongson2_cpufreq: Fix CPU clock rate setting mismerge

During 3.16 merge window, parts of the commit 8e8acb32960f
(MIPS/loongson2_cpufreq: Fix CPU clock rate setting) seem to have
been deleted probably due to a mismerge, and as a result cpufreq
is broken again on Loongson2 boards in 3.16 and newer kernels.
Fix by repeating the fix.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: stable@vger.kernel.org # 3.16
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/7835/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/loongson/lemote-2f/clock.c