From: Bo Shen Date: Fri, 24 Oct 2014 08:13:25 +0000 (+0800) Subject: ARM: atmel: spl: make initialization more stable X-Git-Tag: v2015.01-rc2~72 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a5f35d63f2ec0f95162da924d346922d5888aa38;p=u-boot ARM: atmel: spl: make initialization more stable We need to make sure the main clock ready field in MCFR is set after switch to main crystal oscillator. 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 674a47061e..57fb04106d 100644 --- a/arch/arm/cpu/at91-common/spl.c +++ b/arch/arm/cpu/at91-common/spl.c @@ -50,6 +50,10 @@ static void switch_to_main_crystal_osc(void) while (!(readl(&pmc->sr) & AT91_PMC_IXR_MOSCSELS)) ; + /* Wait until MAINRDY field is set to make sure main clock is stable */ + while (!(readl(&pmc->mcfr) & AT91_PMC_MAINRDY)) + ; + tmp = readl(&pmc->mor); tmp &= ~AT91_PMC_MOR_MOSCRCEN; tmp &= ~AT91_PMC_MOR_KEY(0xff);