AT91: Makes AT91SAM9RL SoC build correctly against u-boot-atmel/master

[u-boot] / arch / arm / include / asm / arch-at91 / at91rm9200.h

diff --git a/arch/arm/include/asm/arch-at91/at91rm9200.h b/arch/arm/include/asm/arch-at91/at91rm9200.h
index ff180146a84c2e208b19dcdff16c068999b02e7c..42a32d3f15f3277b5d785fa9221609b74d83b46c 100644 (file)
--- a/arch/arm/include/asm/arch-at91/at91rm9200.h
+++ b/arch/arm/include/asm/arch-at91/at91rm9200.h
@@ -21,8 +21,10 @@
 #ifndef __AT91RM9200_H__
 #define __AT91RM9200_H__
 
-#define CONFIG_AT91FAMILY      /* it's a member of AT91 */
-#define CONFIG_ARM920T         /* This is an ARM920T Core      */
+#define CONFIG_AT91FAMILY      /* it's a member of AT91 family */
+#define CONFIG_ARM920T         /* it's an ARM920T Core */
+#define CONFIG_ARCH_CPU_INIT   /* we need arch_cpu_init() for hw timers */
+#define CONFIG_AT91_GPIO       /* and require always gpio features */
 
 /* Periperial Identifiers */
 
@@ -77,6 +79,10 @@
 #define ATMEL_BASE_AIC         0xFFFFF000
 #define ATMEL_BASE_DBGU                0xFFFFF200
 #define ATMEL_BASE_PIO         0xFFFFF400      /* 4x 0x200 Offset */
+#define ATMEL_BASE_PIOA                0xFFFFF400
+#define ATMEL_BASE_PIOB                0xFFFFF600
+#define ATMEL_BASE_PIOC                0xFFFFF800
+#define ATMEL_BASE_PIOD                0xFFFFFA00
 #define ATMEL_BASE_PMC         0xFFFFFC00
 #define ATMEL_BASE_ST          0xFFFFFD00
 #define ATMEL_BASE_RTC         0xFFFFFE00
@@ -99,7 +105,7 @@
 #define ATMEL_PMX_AA_EMDC      0x00008000
 #define ATMEL_PMX_AA_EMDIO     0x00010000
 
-#define ATMEL_PMX_AA_TXD2      0x00810000
+#define ATMEL_PMX_AA_TXD2      0x00800000
 
 #define ATMEL_PMX_AA_TWD       0x02000000
 #define ATMEL_PMX_AA_TWCK      0x04000000