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/include | |
| parent | ba52b7d4afaec172073a4169e1d6522552b2979c (diff) | |
| parent | 94c4c79f2f1acca6e69a50bff5a7d9027509c16b (diff) | |
| download | linux-stable-ca439c9b983ffa14e9eae6030e3ee80ad039388f.tar.gz linux-stable-ca439c9b983ffa14e9eae6030e3ee80ad039388f.tar.bz2 linux-stable-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/include')
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91sam9n12.h | 5 | ||||
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91sam9x5.h | 5 | ||||
| -rw-r--r-- | arch/arm/mach-at91/include/mach/sama5d3.h | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/include/mach/at91sam9n12.h b/arch/arm/mach-at91/include/mach/at91sam9n12.h index d374b87c0459..0151bcf6163c 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9n12.h +++ b/arch/arm/mach-at91/include/mach/at91sam9n12.h @@ -49,6 +49,11 @@ #define AT91SAM9N12_BASE_USART3 0xf8028000 /* + * System Peripherals + */ +#define AT91SAM9N12_BASE_RTC 0xfffffeb0 + +/* * Internal Memory. */ #define AT91SAM9N12_SRAM_BASE 0x00300000 /* Internal SRAM base address */ diff --git a/arch/arm/mach-at91/include/mach/at91sam9x5.h b/arch/arm/mach-at91/include/mach/at91sam9x5.h index c75ee19b58d3..2fc76c49e97c 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9x5.h +++ b/arch/arm/mach-at91/include/mach/at91sam9x5.h @@ -55,6 +55,11 @@ #define AT91SAM9X5_BASE_USART2 0xf8024000 /* + * System Peripherals + */ +#define AT91SAM9X5_BASE_RTC 0xfffffeb0 + +/* * Internal Memory. */ #define AT91SAM9X5_SRAM_BASE 0x00300000 /* Internal SRAM base address */ diff --git a/arch/arm/mach-at91/include/mach/sama5d3.h b/arch/arm/mach-at91/include/mach/sama5d3.h index 31096a8aaf1d..25613d8c6dcd 100644 --- a/arch/arm/mach-at91/include/mach/sama5d3.h +++ b/arch/arm/mach-at91/include/mach/sama5d3.h @@ -73,6 +73,11 @@ #define SAMA5D3_BASE_USART3 0xf8024000 /* + * System Peripherals + */ +#define SAMA5D3_BASE_RTC 0xfffffeb0 + +/* * Internal Memory */ #define SAMA5D3_SRAM_BASE 0x00300000 /* Internal SRAM base address */ |