summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu
diff options
context:
space:
mode:
authorBo Shen <voice.shen@atmel.com>2014-12-15 13:24:32 +0800
committerAndreas Bießmann <andreas.devel@googlemail.com>2015-02-07 23:42:47 +0100
commit0246b7c3b7b974182cc5795b01261d6dd24dde71 (patch)
tree290aba2eb66b51df318a1f86598536c57fa8ddb0 /arch/arm/cpu
parent4514b5f46a27df0843a8504273ee0cb0749ea86e (diff)
downloadblackbird-obmc-uboot-0246b7c3b7b974182cc5795b01261d6dd24dde71.tar.gz
blackbird-obmc-uboot-0246b7c3b7b974182cc5795b01261d6dd24dde71.zip
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 <voice.shen@atmel.com>
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r--arch/arm/cpu/at91-common/spl_atmel.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/cpu/at91-common/spl_atmel.c b/arch/arm/cpu/at91-common/spl_atmel.c
index fdea46665f..9cc1111234 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)
OpenPOWER on IntegriCloud