diff options
| author | Tom Rini <trini@ti.com> | 2015-02-10 10:42:22 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-10 10:42:22 -0500 |
| commit | c956662cc3e2475b451afa9a8b639c0ccc49d432 (patch) | |
| tree | 3e799e9dded7ba103544de55d6d54c6c5f98b6da /arch/arm/cpu/at91-common/spl_atmel.c | |
| parent | 0dac731d1932027f4f813ec7aede35d5e30dec0e (diff) | |
| parent | 657006a1c46f11784757f9437ffaaa5e0c4dea72 (diff) | |
| download | u-boot-c956662cc3e2475b451afa9a8b639c0ccc49d432.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'arch/arm/cpu/at91-common/spl_atmel.c')
| -rw-r--r-- | arch/arm/cpu/at91-common/spl_atmel.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/cpu/at91-common/spl_atmel.c b/arch/arm/cpu/at91-common/spl_atmel.c index 7297530e7d..9cc1111234 100644 --- a/arch/arm/cpu/at91-common/spl_atmel.c +++ b/arch/arm/cpu/at91-common/spl_atmel.c @@ -51,11 +51,23 @@ 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) +{ + /* This only be used for sama5d4 soc now */ +} + +__weak void redirect_int_from_saic_to_aic(void) +{ + /* This only be used for sama5d4 soc now */ } void s_init(void) @@ -70,6 +82,10 @@ void s_init(void) at91_clock_init(CONFIG_SYS_AT91_MAIN_CLOCK); + matrix_init(); + + redirect_int_from_saic_to_aic(); + timer_init(); board_early_init_f(); |