diff options
| author | Olof Johansson <olof@lixom.net> | 2013-11-15 11:10:41 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-11-15 11:10:41 -0800 |
| commit | ca439c9b983ffa14e9eae6030e3ee80ad039388f (patch) | |
| tree | 9ae38ed0b1e6559ffd79896d32248bda50f04839 /arch/arm/mach-at91/at91sam9n12.c | |
| parent | ba52b7d4afaec172073a4169e1d6522552b2979c (diff) | |
| parent | 94c4c79f2f1acca6e69a50bff5a7d9027509c16b (diff) | |
Merge tag 'at91-fixes-non-critical' of git://github.com/at91linux/linux-at91 into fixes
From Nicolas Ferre, fixes for early boot hangs on at91:
Fixes for RTT & RTC interrupts that can fire early during boot process
and kill the system.
* tag 'at91-fixes-non-critical' of git://github.com/at91linux/linux-at91:
ARM: at91: fix hanged boot due to early rtt-interrupt
ARM: at91: fix hanged boot due to early rtc-interrupt
Diffstat (limited to 'arch/arm/mach-at91/at91sam9n12.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9n12.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/at91sam9n12.c b/arch/arm/mach-at91/at91sam9n12.c index 2d895a29773..388ec3aec4b 100644 --- a/arch/arm/mach-at91/at91sam9n12.c +++ b/arch/arm/mach-at91/at91sam9n12.c @@ -224,7 +224,13 @@ static void __init at91sam9n12_map_io(void) at91_init_sram(0, AT91SAM9N12_SRAM_BASE, AT91SAM9N12_SRAM_SIZE); } +static void __init at91sam9n12_initialize(void) +{ + at91_sysirq_mask_rtc(AT91SAM9N12_BASE_RTC); +} + AT91_SOC_START(at91sam9n12) .map_io = at91sam9n12_map_io, .register_clocks = at91sam9n12_register_clocks, + .init = at91sam9n12_initialize, AT91_SOC_END |