summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-06-22 12:52:26 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-06-30 22:34:54 +0200
commita3d643a7f14e8a3e2f56801049e6a00bd3814106 (patch)
tree966cae225fd414bb73d58443781f5151ab0ebe61 /arch
parent27c5d37ecca94af584e4794ca7175648e766df54 (diff)
downloadbarebox-a3d643a7f14e8a3e2f56801049e6a00bd3814106.tar.gz
barebox-a3d643a7f14e8a3e2f56801049e6a00bd3814106.tar.xz
ARM i.MX speed: sparse fixes
- Add missing #include <mach/clock.h> - add global functions to mach/clock.h Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-imx/include/mach/clock.h2
-rw-r--r--arch/arm/mach-imx/speed-imx35.c2
-rw-r--r--arch/arm/mach-imx/speed-imx51.c5
-rw-r--r--arch/arm/mach-imx/speed-imx53.c3
4 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/include/mach/clock.h b/arch/arm/mach-imx/include/mach/clock.h
index 10821782fe..060d265d5e 100644
--- a/arch/arm/mach-imx/include/mach/clock.h
+++ b/arch/arm/mach-imx/include/mach/clock.h
@@ -30,6 +30,8 @@ ulong imx_get_lcdclk(void);
ulong imx_get_i2cclk(void);
ulong imx_get_mmcclk(void);
ulong imx_get_cspiclk(void);
+ulong imx_get_ipgclk(void);
+ulong imx_get_usbclk(void);
int imx_clko_set_div(int div);
void imx_clko_set_src(int src);
diff --git a/arch/arm/mach-imx/speed-imx35.c b/arch/arm/mach-imx/speed-imx35.c
index 1e1c39ff82..2bdcc07100 100644
--- a/arch/arm/mach-imx/speed-imx35.c
+++ b/arch/arm/mach-imx/speed-imx35.c
@@ -84,7 +84,7 @@ unsigned long imx_get_ahbclk(void)
return fref / aad->ahb;
}
-static unsigned long imx_get_ipgclk(void)
+unsigned long imx_get_ipgclk(void)
{
ulong clk = imx_get_ahbclk();
diff --git a/arch/arm/mach-imx/speed-imx51.c b/arch/arm/mach-imx/speed-imx51.c
index 8d1ecf3e40..1c3523da55 100644
--- a/arch/arm/mach-imx/speed-imx51.c
+++ b/arch/arm/mach-imx/speed-imx51.c
@@ -2,11 +2,12 @@
#include <io.h>
#include <asm-generic/div64.h>
#include <mach/imx51-regs.h>
+#include <mach/clock.h>
#include <mach/clock-imx51_53.h>
static u32 ccm_readl(u32 ofs)
{
- return readl(MX51_CCM_BASE_ADDR + ofs);
+ return readl(IOMEM(MX51_CCM_BASE_ADDR) + ofs);
}
static unsigned long ckil_get_rate(void)
@@ -142,7 +143,7 @@ unsigned long imx_get_uartclk(void)
return parent_rate / (prediv * podf);
}
-static unsigned long imx_get_ahbclk(void)
+unsigned long imx_get_ahbclk(void)
{
u32 reg, div;
diff --git a/arch/arm/mach-imx/speed-imx53.c b/arch/arm/mach-imx/speed-imx53.c
index 634341e738..653dae33b6 100644
--- a/arch/arm/mach-imx/speed-imx53.c
+++ b/arch/arm/mach-imx/speed-imx53.c
@@ -2,6 +2,7 @@
#include <io.h>
#include <asm-generic/div64.h>
#include <mach/imx-regs.h>
+#include <mach/clock.h>
#include "mach/clock-imx51_53.h"
static u32 ccm_readl(u32 ofs)
@@ -139,7 +140,7 @@ unsigned long imx_get_uartclk(void)
return parent_rate / (prediv * podf);
}
-static unsigned long imx_get_ahbclk(void)
+unsigned long imx_get_ahbclk(void)
{
u32 reg, div;