Merge branch 'rmobile-mx' of git://git.denx.de/u-boot-sh

[oweals/u-boot.git] / arch / arm / mach-at91 / include / mach / sama5d2.h

diff --git a/arch/arm/mach-at91/include/mach/sama5d2.h b/arch/arm/mach-at91/include/mach/sama5d2.h
index dd5a2a7523d8a61bed53314b8afe29f9cc6c2976..a4ec0aac619cb6d8a98a3750f7f332791d6b5a56 100644 (file)
--- a/arch/arm/mach-at91/include/mach/sama5d2.h
+++ b/arch/arm/mach-at91/include/mach/sama5d2.h
@@ -10,11 +10,6 @@
 #ifndef __SAMA5D2_H
 #define __SAMA5D2_H
 
-/*
- * definitions to be used in other places
- */
-#define CONFIG_AT91FAMILY      /* It's a member of AT91 */
-
 /*
  * Peripheral identifiers/interrupts.
  */
@@ -135,7 +130,11 @@
 /*
  * Address Memory Space
  */
+#define ATMEL_BASE_CS0                 0x10000000
 #define ATMEL_BASE_DDRCS               0x20000000
+#define ATMEL_BASE_CS1                 0x60000000
+#define ATMEL_BASE_CS2                 0x70000000
+#define ATMEL_BASE_CS3                 0x80000000
 #define ATMEL_BASE_QSPI0_AES_MEM       0x90000000
 #define ATMEL_BASE_QSPI1_AES_MEM       0x98000000
 #define ATMEL_BASE_SDMMC0              0xa0000000
@@ -165,6 +164,7 @@
  */
 #define ATMEL_BASE_PMECC       (ATMEL_BASE_HSMC + 0x70)
 #define ATMEL_BASE_PMERRLOC    (ATMEL_BASE_HSMC + 0x500)
+#define ATMEL_BASE_SMC         (ATMEL_BASE_HSMC + 0x700)
 
 #define ATMEL_BASE_PIOB                (ATMEL_BASE_PIOA + 0x40)
 #define ATMEL_BASE_PIOC                (ATMEL_BASE_PIOB + 0x40)
@@ -217,7 +217,11 @@
 #define ARCH_EXID_SAMA5D28CU   0x00000010
 #define ARCH_EXID_SAMA5D28CN   0x00000020
 
-#define cpu_is_sama5d2()       (get_chip_id() == ARCH_ID_SAMA5D2)
+#define ARCH_ID_SAMA5D2_SIP            0x8a5c08c2
+#define ARCH_EXID_SAMA5D225C_D1M       0x00000053
+#define ARCH_EXID_SAMA5D27C_D5M                0x00000032
+#define ARCH_EXID_SAMA5D27C_D1G                0x00000033
+#define ARCH_EXID_SAMA5D28C_D1G                0x00000013
 
 /* PIT Timer(PIT_PIIR) */
 #define CONFIG_SYS_TIMER_COUNTER       0xf804803c
@@ -228,6 +232,7 @@
 #ifndef __ASSEMBLY__
 unsigned int get_chip_id(void);
 unsigned int get_extension_chip_id(void);
+int cpu_is_sama5d2(void);
 unsigned int has_lcdc(void);
 char *get_cpu_name(void);
 #endif