On Fri, Mar 19, 2010 at 03:45:55PM +0100, Eric Benard wrote: > CONFIG_MX35_HCLK_FREQ -> CONFIG_MX25_HCLK_FREQ > > Signed-off-by: Eric Benard <eric@xxxxxxxxxx> Applied to -master modulo the changes in the not yet existing board/eukrea_cpuimx25/config.h file. Sascha > --- > arch/arm/mach-imx/speed-imx25.c | 4 ++-- > board/eukrea_cpuimx25/config.h | 2 ++ > board/freescale-mx25-3-stack/config.h | 2 +- > 3 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-imx/speed-imx25.c b/arch/arm/mach-imx/speed-imx25.c > index beb7efe..a615017 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/eukrea_cpuimx25/config.h b/board/eukrea_cpuimx25/config.h > index 460239d..982c406 100644 > --- a/board/eukrea_cpuimx25/config.h > +++ b/board/eukrea_cpuimx25/config.h > @@ -20,6 +20,8 @@ > #ifndef __CONFIG_H > #define __CONFIG_H > > +#define CONFIG_MX25_HCLK_FREQ 24000000 > + > #endif > > /* nothing to do here yet */ > diff --git a/board/freescale-mx25-3-stack/config.h b/board/freescale-mx25-3-stack/config.h > index 0e3b175..f35e8a0 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 > > -- > 1.6.3.3 > > > _______________________________________________ > barebox mailing list > barebox@xxxxxxxxxxxxxxxxxxx > http://lists.infradead.org/mailman/listinfo/barebox > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox