[lkml]   [2014]   [Nov]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[3.16.y-ckt extended stable] Patch "MIPS: loongson2_cpufreq: Fix CPU clock rate setting mismerge" has been added to staging queue
This is a note to let you know that I have just added a patch titled

MIPS: loongson2_cpufreq: Fix CPU clock rate setting mismerge

to the linux-3.16.y-queue branch of the 3.16.y-ckt extended stable tree
which can be found at:;a=shortlog;h=refs/heads/linux-3.16.y-queue

This patch is scheduled to be released in version 3.16.7-ckt1.

If you, or anyone else, feels it should not be added to this tree, please
reply to this email.

For more information about the 3.16.y-ckt tree, see



From f563a83bc7161702ce438b7a1164d67ddb3bca05 Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <>
Date: Sun, 21 Sep 2014 15:38:43 +0300
Subject: MIPS: loongson2_cpufreq: Fix CPU clock rate setting mismerge

commit aa08ed55442ac6f9810c055e1474be34e785e556 upstream.

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 <>
Cc: Rafael J. Wysocki <>
Signed-off-by: Ralf Baechle <>
Signed-off-by: Luis Henriques <>
arch/mips/loongson/lemote-2f/clock.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/mips/loongson/lemote-2f/clock.c b/arch/mips/loongson/lemote-2f/clock.c
index 1eed38e28b1e..ebfb9cd71ca1 100644
--- a/arch/mips/loongson/lemote-2f/clock.c
+++ b/arch/mips/loongson/lemote-2f/clock.c
@@ -91,6 +91,7 @@ EXPORT_SYMBOL(clk_put);

int clk_set_rate(struct clk *clk, unsigned long rate)
+ unsigned int rate_khz = rate / 1000;
struct cpufreq_frequency_table *pos;
int ret = 0;
int regval;
@@ -107,9 +108,9 @@ int clk_set_rate(struct clk *clk, unsigned long rate)

cpufreq_for_each_valid_entry(pos, loongson2_clockmod_table)
- if (rate == pos->frequency)
+ if (rate_khz == pos->frequency)
- if (rate != pos->frequency)
+ if (rate_khz != pos->frequency)
return -ENOTSUPP;

clk->rate = rate;

 \ /
  Last update: 2014-11-10 12:41    [W:0.036 / U:4.056 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site