| Message ID | 20191218190454.420358-2-lkundrak@v3.sk (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 0bd0f30bbf060891f58866a46083a9931f71787c |
| Headers | show |
| Series | [1/2] ARM: mmp: do not divide the clock rate | expand |
Hello: This series was applied to soc/soc.git (refs/heads/for-next). On Wed, 18 Dec 2019 20:04:53 +0100 you wrote: > This was done because the clock driver returned the wrong rate, which is > fixed in "clk: mmp2: Fix the order of timer mux parents" patch. > > Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> > --- > arch/arm/mach-mmp/time.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Here is a summary with links: - [1/2] ARM: mmp: do not divide the clock rate https://git.kernel.org/soc/soc/c/0bd0f30bbf060891f58866a46083a9931f71787c - [2/2] clk: mmp2: Fix the order of timer mux parents https://git.kernel.org/soc/soc/c/8bea5ac0fbc5b2103f8779ddff216122e3c2e1ad You are awesome, thank you!
diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c index 110dcb3314d13..c65cfc1ad99b4 100644 --- a/arch/arm/mach-mmp/time.c +++ b/arch/arm/mach-mmp/time.c @@ -207,7 +207,7 @@ static int __init mmp_dt_init_timer(struct device_node *np) ret = clk_prepare_enable(clk); if (ret) return ret; - rate = clk_get_rate(clk) / 2; + rate = clk_get_rate(clk); } else if (cpu_is_pj4()) { rate = 6500000; } else {
This was done because the clock driver returned the wrong rate, which is fixed in "clk: mmp2: Fix the order of timer mux parents" patch. Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> --- arch/arm/mach-mmp/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)