summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2007-10-09 17:24:25 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2007-10-09 17:24:25 +0200
commitb1613059460b93dbc55adcc9d52895eb3ce721eb (patch)
treee5db5b57c275f0592aea8ea6867428b8b7835070 /include
parent8f29f6481e9073b85361d8395c1e5ba531761e75 (diff)
downloadbarebox-b1613059460b93dbc55adcc9d52895eb3ce721eb.tar.gz
barebox-b1613059460b93dbc55adcc9d52895eb3ce721eb.tar.xz
change imx clock functions so that they have the same name for
i.MX1 and i.MX27
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/arch-imx/clock.h14
1 files changed, 12 insertions, 2 deletions
diff --git a/include/asm-arm/arch-imx/clock.h b/include/asm-arm/arch-imx/clock.h
index 6874b17bc0..6c23a127f5 100644
--- a/include/asm-arm/arch-imx/clock.h
+++ b/include/asm-arm/arch-imx/clock.h
@@ -3,10 +3,20 @@
#define __ASM_ARCH_CLOCK_H
unsigned int imx_decode_pll(unsigned int pll, unsigned int f_ref);
-ulong imx_get_system_pll(void);
+#ifdef CONFIG_ARCH_IMX27
+ulong imx_get_armclk(void);
+#endif
+#ifdef CONFIG_ARCH_IMX1
+static inline ulong imx_get_armclk(void)
+{
+ return imx_get_mpllclk();
+}
+#endif
+ulong imx_get_mpllclk(void);
+ulong imx_get_spllclk(void);
ulong imx_get_fclk(void);
ulong imx_get_hclk(void);
-ulong imx_get_BCLK(void);
+ulong imx_get_bclk(void);
ulong imx_get_perclk1(void);
ulong imx_get_perclk2(void);
ulong imx_get_perclk3(void);