From: Bo Shen Date: Mon, 15 Dec 2014 05:24:27 +0000 (+0800) Subject: ARM: atmel: clock: make it possible to configure HMX32 X-Git-Tag: v2015.04-rc2~33^2~24 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=05084443f02ecc3b74f6604edb69f199c804ffb9;p=oweals%2Fu-boot.git ARM: atmel: clock: make it possible to configure HMX32 Signed-off-by: Bo Shen --- diff --git a/arch/arm/cpu/armv7/at91/clock.c b/arch/arm/cpu/armv7/at91/clock.c index 2cdddb2504..0bf453eff5 100644 --- a/arch/arm/cpu/armv7/at91/clock.c +++ b/arch/arm/cpu/armv7/at91/clock.c @@ -130,10 +130,18 @@ void at91_mck_init(u32 mckr) AT91_PMC_MCKR_PRES_MASK | AT91_PMC_MCKR_MDIV_MASK | AT91_PMC_MCKR_PLLADIV_2); +#ifdef CPU_HAS_H32MXDIV + tmp &= ~AT91_PMC_MCKR_H32MXDIV; +#endif + tmp |= mckr & (AT91_PMC_MCKR_CSS_MASK | AT91_PMC_MCKR_PRES_MASK | AT91_PMC_MCKR_MDIV_MASK | AT91_PMC_MCKR_PLLADIV_2); +#ifdef CPU_HAS_H32MXDIV + tmp |= mckr & AT91_PMC_MCKR_H32MXDIV; +#endif + writel(tmp, &pmc->mckr); while (!(readl(&pmc->sr) & AT91_PMC_MCKRDY))