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
This commit is contained in:
Tom Rini
2019-06-10 09:41:00 -04:00
8 changed files with 65 additions and 1 deletions

View File

@@ -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);