summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2010-04-22 12:53:24 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-05-03 15:07:02 +0200
commit8464f0e1c01b4e4fb71aadbeacc8d775cc933c7c (patch)
tree3e54108358d491130b35617c560581d4c8056223
parent6087daaa53e46848230f0af10f484f9140a63792 (diff)
downloadbarebox-8464f0e1c01b4e4fb71aadbeacc8d775cc933c7c.tar.gz
barebox-8464f0e1c01b4e4fb71aadbeacc8d775cc933c7c.tar.xz
i.MX35: Fix ahbclock calculation
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-imx/speed-imx35.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/speed-imx35.c b/arch/arm/mach-imx/speed-imx35.c
index 1721079a6a..c5a31c7996 100644
--- a/arch/arm/mach-imx/speed-imx35.c
+++ b/arch/arm/mach-imx/speed-imx35.c
@@ -74,9 +74,11 @@ unsigned long imx_get_ahbclk(void)
{
unsigned long pdr0 = readl(IMX_CCM_BASE + CCM_PDR0);
struct arm_ahb_div *aad;
- unsigned long fref = imx_get_armclk();
+ unsigned long fref = imx_get_mpllclk();
aad = &clk_consumer[(pdr0 >> 16) & 0xf];
+ if (aad->sel)
+ fref = fref * 3 / 4;
return fref / aad->ahb;
}