diff options
| author | Tom Rini | 2019-06-10 09:41:00 -0400 |
|---|---|---|
| committer | Tom Rini | 2019-06-10 09:41:00 -0400 |
| commit | eb53a18c9e903e35e8e8d52da96c33b63822881c (patch) | |
| tree | d16ce6e74188cec829be799e76caa1a744e12a25 /arch/arm/mach-at91 | |
| parent | 5973901826c73462306fbe4051bc3643dca6b88f (diff) | |
| parent | 9ed91550d548f76f40e22f0562ff3c4ba15f85c7 (diff) | |
Merge tag 'u-boot-atmel-fixes-2019.07-a' of git://git.denx.de/u-boot-atmel
First set of u-boot-atmel fixes for 2019.07 cycle
Diffstat (limited to 'arch/arm/mach-at91')
| -rw-r--r-- | arch/arm/mach-at91/spl_atmel.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/spl_atmel.c b/arch/arm/mach-at91/spl_atmel.c index ef745c94775..85290be3696 100644 --- a/arch/arm/mach-at91/spl_atmel.c +++ b/arch/arm/mach-at91/spl_atmel.c @@ -44,7 +44,15 @@ static void switch_to_main_crystal_osc(void) #endif tmp = readl(&pmc->mor); +/* + * some boards have an external oscillator with driving. + * in this case we need to disable the internal SoC driving (bypass mode) + */ +#if defined(CONFIG_SPL_AT91_MCK_BYPASS) + tmp |= AT91_PMC_MOR_OSCBYPASS; +#else tmp &= ~AT91_PMC_MOR_OSCBYPASS; +#endif tmp &= ~AT91_PMC_MOR_KEY(0xff); tmp |= AT91_PMC_MOR_KEY(0x37); writel(tmp, &pmc->mor); |