diff options
| author | Olof Johansson <olof@lixom.net> | 2013-11-15 20:10:41 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-11-15 20:10:41 +0100 |
| commit | ca439c9b983ffa14e9eae6030e3ee80ad039388f (patch) | |
| tree | 9ae38ed0b1e6559ffd79896d32248bda50f04839 /arch/arm/mach-at91/sama5d3.c | |
| parent | video: exynos_mipi_dsim: Remove unused variable (diff) | |
| parent | ARM: at91: fix hanged boot due to early rtt-interrupt (diff) | |
| download | linux-ca439c9b983ffa14e9eae6030e3ee80ad039388f.tar.xz linux-ca439c9b983ffa14e9eae6030e3ee80ad039388f.zip | |
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/sama5d3.c')
| -rw-r--r-- | arch/arm/mach-at91/sama5d3.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/sama5d3.c b/arch/arm/mach-at91/sama5d3.c index 401279715ab1..3ea86428ee09 100644 --- a/arch/arm/mach-at91/sama5d3.c +++ b/arch/arm/mach-at91/sama5d3.c @@ -371,7 +371,13 @@ static void __init sama5d3_map_io(void) at91_init_sram(0, SAMA5D3_SRAM_BASE, SAMA5D3_SRAM_SIZE); } +static void __init sama5d3_initialize(void) +{ + at91_sysirq_mask_rtc(SAMA5D3_BASE_RTC); +} + AT91_SOC_START(sama5d3) .map_io = sama5d3_map_io, .register_clocks = sama5d3_register_clocks, + .init = sama5d3_initialize, AT91_SOC_END |