From: Bo Shen Date: Mon, 15 Dec 2014 05:24:32 +0000 (+0800) Subject: ARM: atmel: spl: can not disable osc for sama5d4 X-Git-Tag: v2015.04-rc2~33^2~19 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0246b7c3b7b974182cc5795b01261d6dd24dde71;p=platform%2Fkernel%2Fu-boot.git ARM: atmel: spl: can not disable osc for sama5d4 The SAMA5D4 SoC on chip rc oscillator can not be disabled. Signed-off-by: Bo Shen --- diff --git a/arch/arm/cpu/at91-common/spl_atmel.c b/arch/arm/cpu/at91-common/spl_atmel.c index fdea466..9cc1111 100644 --- a/arch/arm/cpu/at91-common/spl_atmel.c +++ b/arch/arm/cpu/at91-common/spl_atmel.c @@ -51,11 +51,13 @@ static void switch_to_main_crystal_osc(void) while (!(readl(&pmc->mcfr) & AT91_PMC_MAINRDY)) ; +#ifndef CONFIG_SAMA5D4 tmp = readl(&pmc->mor); tmp &= ~AT91_PMC_MOR_MOSCRCEN; tmp &= ~AT91_PMC_MOR_KEY(0xff); tmp |= AT91_PMC_MOR_KEY(0x37); writel(tmp, &pmc->mor); +#endif } __weak void matrix_init(void)