summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-at91/at91sam9260.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-15 13:45:59 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-15 13:45:59 +0200
commit91d0322bef047e2916b3e52741411bffc63929cb (patch)
tree44c4fd13cc17755a6db8a3d70cffb86e57a838dc /include/asm-arm/arch-at91/at91sam9260.h
parent065cb3dfe24978651caedfa54da585388ad15dde (diff)
parent50515af207d410c9f228380e529c56f43c3de0bd (diff)
downloadkernel-crypto-91d0322bef047e2916b3e52741411bffc63929cb.tar.gz
kernel-crypto-91d0322bef047e2916b3e52741411bffc63929cb.tar.xz
kernel-crypto-91d0322bef047e2916b3e52741411bffc63929cb.zip
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'include/asm-arm/arch-at91/at91sam9260.h')
-rw-r--r--include/asm-arm/arch-at91/at91sam9260.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/include/asm-arm/arch-at91/at91sam9260.h b/include/asm-arm/arch-at91/at91sam9260.h
index c8934fe34dc..889872a3f2a 100644
--- a/include/asm-arm/arch-at91/at91sam9260.h
+++ b/include/asm-arm/arch-at91/at91sam9260.h
@@ -6,6 +6,8 @@
* Common definitions.
* Based on AT91SAM9260 datasheet revision A (Preliminary).
*
+ * Includes also definitions for AT91SAM9XE and AT91SAM9G families
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -123,5 +125,14 @@
#define AT91SAM9XE_FLASH_BASE 0x00200000 /* Internal FLASH base address */
#define AT91SAM9XE_SRAM_BASE 0x00300000 /* Internal SRAM base address */
+#define AT91SAM9G20_ROM_BASE 0x00100000 /* Internal ROM base address */
+#define AT91SAM9G20_ROM_SIZE SZ_32K /* Internal ROM size (32Kb) */
+
+#define AT91SAM9G20_SRAM0_BASE 0x00200000 /* Internal SRAM 0 base address */
+#define AT91SAM9G20_SRAM0_SIZE SZ_16K /* Internal SRAM 0 size (16Kb) */
+#define AT91SAM9G20_SRAM1_BASE 0x00300000 /* Internal SRAM 1 base address */
+#define AT91SAM9G20_SRAM1_SIZE SZ_16K /* Internal SRAM 1 size (16Kb) */
+
+#define AT91SAM9G20_UHP_BASE 0x00500000 /* USB Host controller */
#endif