diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-01 02:11:33 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-01 02:12:07 +0400 |
| commit | d1ef5bd711b6b01e6a73cf186245d19939882706 (patch) | |
| tree | 14842d65a25839c31cf4e99ded0410d569f1a4aa /arch/arm/mach-at91/soc.h | |
| parent | 26690863e2c1fa4fee5f6137b219f4b8a1a02287 (diff) | |
| parent | cce783c608fee0716cff65926d1835a5fd097b69 (diff) | |
| download | linux-d1ef5bd711b6b01e6a73cf186245d19939882706.tar.xz | |
Merge tag 'at91-for-next-soc' of git://github.com/at91linux/linux-at91 into next/newsoc
ARM: at91: Add at91sam9n12 and refence booard
* tag 'at91-for-next-soc' of git://github.com/at91linux/linux-at91:
ARM: at91: Add DT description files for AT91SAM9N12-EK
ARM: at91: Add machine files for AT91SAM9N12 SoC
ARM: at91: Add machine header file for AT91SAM9N12 SoC
Based on at91/dt branch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91/soc.h')
| -rw-r--r-- | arch/arm/mach-at91/soc.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/soc.h b/arch/arm/mach-at91/soc.h index 683dddfd8b13..a9cfeb153719 100644 --- a/arch/arm/mach-at91/soc.h +++ b/arch/arm/mach-at91/soc.h @@ -20,6 +20,7 @@ extern struct at91_init_soc at91sam9263_soc; extern struct at91_init_soc at91sam9g45_soc; extern struct at91_init_soc at91sam9rl_soc; extern struct at91_init_soc at91sam9x5_soc; +extern struct at91_init_soc at91sam9n12_soc; static inline int at91_soc_is_enabled(void) { @@ -53,3 +54,7 @@ static inline int at91_soc_is_enabled(void) #if !defined(CONFIG_SOC_AT91SAM9X5) #define at91sam9x5_soc at91_boot_soc #endif + +#if !defined(CONFIG_SOC_AT91SAM9N12) +#define at91sam9n12_soc at91_boot_soc +#endif |