Patch "clk: pxa: fix core frequency reporting unit" has been added to the 4.1-stable tree

PATCH [email protected] 1 participant 1 message Sep 16, 2015

Subsystems (2)

Stable branch Common clk

lore

Share & tools

lore

[email protected]

author maintainer Applied

2015-09-16 20:00 UTC #0 lore raw

This is a note to let you know that I've just added the patch titled

clk: pxa: fix core frequency reporting unit

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
clk-pxa-fix-core-frequency-reporting-unit.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 4b5fb7dc9096d949a22651370bb6bf11f21edb30 Mon Sep 17 00:00:00 2001

From: Robert Jarzmik <[email protected]>
Date: Sun, 12 Jul 2015 22:49:53 +0200
Subject: clk: pxa: fix core frequency reporting unit

From: Robert Jarzmik <[email protected]>

commit 4b5fb7dc9096d949a22651370bb6bf11f21edb30 upstream.

Legacy drivers which are not yet ported, such as cpufreq-pxa[23]xx, rely on pxaXXx_get_clk_frequency_khz() to find the CPU core frequency.

This reporting was broken because the expected unit is kHz and not Hz. Fix the reporting for pxa25x, pxa27x and pxa3xx.

Fixes fe7710fae477 ("clk: add pxa25x clock drivers")

Fixes d40670dc6169 ("clk: add pxa27x clock drivers")

Fixes 9bbb8a338fb2 ("clk: pxa: add pxa3xx clock driver")

Signed-off-by Robert Jarzmik <[email protected]>

Signed-off-by Stephen Boyd <[email protected]>

Signed-off-by Greg Kroah-Hartman <[email protected]>

---
 drivers/clk/pxa/clk-pxa25x.c |    2 +-
 drivers/clk/pxa/clk-pxa27x.c |    2 +-
 drivers/clk/pxa/clk-pxa3xx.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

drivers/clk/pxa/clk-pxa25x.c +1 -1

@@ -79,7 +79,7 @@ unsigned int pxa25x_get_clk_frequency_kh
 			clks[3] / 1000000, (clks[3] % 1000000) / 10000);
 	}
 
-	return (unsigned int)clks[0];
+	return (unsigned int)clks[0] / KHz;
 }
 
 static unsigned long clk_pxa25x_memory_get_rate(struct clk_hw *hw,

drivers/clk/pxa/clk-pxa27x.c +1 -1

@@ -80,7 +80,7 @@ unsigned int pxa27x_get_clk_frequency_kh
 		pr_info("System bus clock: %ld.%02ldMHz\n",
 			clks[4] / 1000000, (clks[4] % 1000000) / 10000);
 	}
-	return (unsigned int)clks[0];
+	return (unsigned int)clks[0] / KHz;
 }
 
 bool pxa27x_is_ppll_disabled(void)

drivers/clk/pxa/clk-pxa3xx.c +1 -1

@@ -78,7 +78,7 @@ unsigned int pxa3xx_get_clk_frequency_kh
 		pr_info("System bus clock: %ld.%02ldMHz\n",
 			clks[4] / 1000000, (clks[4] % 1000000) / 10000);
 	}
-	return (unsigned int)clks[0];
+	return (unsigned int)clks[0] / KHz;
 }
 
 static unsigned long clk_pxa3xx_ac97_get_rate(struct clk_hw *hw,

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/clk-pxa-fix-core-frequency-reporting-unit.patch