aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWeijie Gao <hackpascal@gmail.com>2016-03-16 23:34:09 -0400
committerRalf Baechle <ralf@linux-mips.org>2016-04-03 06:32:09 -0400
commitc338d59d12dc93c3287160acd7e726b56dc94f43 (patch)
treef26c90d90253ebd00fac0d964b152f09a9bc2fba
parent2b885ea66f4cb15cc3812dc90ddfb3b6b0567561 (diff)
MIPS: ath79: Fix the ar724x clock calculation
According to the AR7242 datasheet section 2.8, AR724X CPUs use a 40MHz input clock as the REF_CLK instead of 5MHz. The correct CPU PLL calculation procedure is as follows: CPU_PLL = (FB * REF_CLK) / REF_DIV / 2. This patch is compatible with the current calculation procedure with default FB and REF_DIV values. Tested on AR7240, AR7241 and AR7242. Signed-off-by: Weijie Gao <hackpascal@gmail.com> Signed-off-by: Alban Bedel <albeu@free.fr> (Fixed the commit log message) Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/12870/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/ath79/clock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/ath79/clock.c b/arch/mips/ath79/clock.c
index eb5117ced95a..ed2846578405 100644
--- a/arch/mips/ath79/clock.c
+++ b/arch/mips/ath79/clock.c
@@ -26,7 +26,7 @@
26#include "common.h" 26#include "common.h"
27 27
28#define AR71XX_BASE_FREQ 40000000 28#define AR71XX_BASE_FREQ 40000000
29#define AR724X_BASE_FREQ 5000000 29#define AR724X_BASE_FREQ 40000000
30#define AR913X_BASE_FREQ 5000000 30#define AR913X_BASE_FREQ 5000000
31 31
32static struct clk *clks[3]; 32static struct clk *clks[3];
@@ -103,8 +103,8 @@ static void __init ar724x_clocks_init(void)
103 div = ((pll >> AR724X_PLL_FB_SHIFT) & AR724X_PLL_FB_MASK); 103 div = ((pll >> AR724X_PLL_FB_SHIFT) & AR724X_PLL_FB_MASK);
104 freq = div * ref_rate; 104 freq = div * ref_rate;
105 105
106 div = ((pll >> AR724X_PLL_REF_DIV_SHIFT) & AR724X_PLL_REF_DIV_MASK); 106 div = ((pll >> AR724X_PLL_REF_DIV_SHIFT) & AR724X_PLL_REF_DIV_MASK) * 2;
107 freq *= div; 107 freq /= div;
108 108
109 cpu_rate = freq; 109 cpu_rate = freq;
110 110