From: Bo Shen Date: Fri, 24 Oct 2014 08:13:26 +0000 (+0800) Subject: ARM: atmel: spl: make css field configurable X-Git-Tag: v2015.01-rc2~71 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=da79fa4d7736601b1e484dc23838f6976b1d761b;p=u-boot ARM: atmel: spl: make css field configurable The clock source for master clock can be slow clock, main clock, plla clock or upll clock. So, make the clock source selection field in mckr can be configured. Signed-off-by: Bo Shen Signed-off-by: Andreas Bießmann --- diff --git a/arch/arm/cpu/at91-common/spl.c b/arch/arm/cpu/at91-common/spl.c index 57fb04106d..81f5f53804 100644 --- a/arch/arm/cpu/at91-common/spl.c +++ b/arch/arm/cpu/at91-common/spl.c @@ -76,10 +76,12 @@ void at91_mck_init(u32 mckr) u32 tmp; tmp = readl(&pmc->mckr); - tmp &= ~(AT91_PMC_MCKR_PRES_MASK | + tmp &= ~(AT91_PMC_MCKR_CSS_MASK | + AT91_PMC_MCKR_PRES_MASK | AT91_PMC_MCKR_MDIV_MASK | AT91_PMC_MCKR_PLLADIV_2); - tmp |= mckr & (AT91_PMC_MCKR_PRES_MASK | + tmp |= mckr & (AT91_PMC_MCKR_CSS_MASK | + AT91_PMC_MCKR_PRES_MASK | AT91_PMC_MCKR_MDIV_MASK | AT91_PMC_MCKR_PLLADIV_2); writel(tmp, &pmc->mckr);