diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-03-22 09:20:34 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-03-22 09:20:34 +0100 |
| commit | c6cdbe71c9614d2fc409d4d538e80a53a4bcdc32 (patch) | |
| tree | f1392c1b498ae36a3c65f76489a87218e8b46f77 | |
| parent | 994f82bf9abbeacd77d138ce9ed656518f430094 (diff) | |
| parent | ce2411432e23b5cc313c92278b2320bf1547c002 (diff) | |
| download | barebox-c6cdbe71c9614d2fc409d4d538e80a53a4bcdc32.tar.gz barebox-c6cdbe71c9614d2fc409d4d538e80a53a4bcdc32.tar.xz | |
Merge branch 'master' into next
| -rw-r--r-- | arch/arm/mach-imx/speed-imx25.c | 4 | ||||
| -rw-r--r-- | board/freescale-mx25-3-stack/config.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/speed-imx25.c b/arch/arm/mach-imx/speed-imx25.c index beb7efe0..a615017e 100644 --- a/arch/arm/mach-imx/speed-imx25.c +++ b/arch/arm/mach-imx/speed-imx25.c @@ -7,13 +7,13 @@ unsigned long imx_get_mpllclk(void) { ulong mpctl = readl(IMX_CCM_BASE + CCM_MPCTL); - return imx_decode_pll(mpctl, CONFIG_MX35_HCLK_FREQ); + return imx_decode_pll(mpctl, CONFIG_MX25_HCLK_FREQ); } unsigned long imx_get_upllclk(void) { ulong ppctl = readl(IMX_CCM_BASE + CCM_UPCTL); - return imx_decode_pll(ppctl, CONFIG_MX35_HCLK_FREQ); + return imx_decode_pll(ppctl, CONFIG_MX25_HCLK_FREQ); } unsigned long imx_get_armclk(void) diff --git a/board/freescale-mx25-3-stack/config.h b/board/freescale-mx25-3-stack/config.h index 0e3b175a..f35e8a05 100644 --- a/board/freescale-mx25-3-stack/config.h +++ b/board/freescale-mx25-3-stack/config.h @@ -24,7 +24,7 @@ * Definitions related to passing arguments to kernel. */ -#define CONFIG_MX35_HCLK_FREQ 24000000 +#define CONFIG_MX25_HCLK_FREQ 24000000 #endif |