AT91: fix at91sam9260.h for AT91SAM9XE

PATCH Superseded Reinhard Meyer 1 participant 2 messages Aug 25, 2010 – Sep 3, 2010

Subsystems (2)

Arm (32-bit) Arm/Microchip (AT91) SoC support

lore

Share & tools

lore

Reinhard Meyer

author

2010-08-25 11:59 UTC #0 lore raw

PATCH v3 1/1 AT91: fix at91sam9260.h for AT91SAM9XE

Define the different location of the GPBRs for the 9XE Define the proper CPU Name

Signed-off-by Reinhard Meyer <[email protected]>

---
 arch/arm/include/asm/arch-at91/at91sam9260.h |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

arch/arm/include/asm/arch-at91/at91sam9260.h +14 -4

index ec04318..cb34a94 100644
@@ -59,7 +59,15 @@
 #define AT91_RTT_BASE		0xfffffd20
 #define AT91_PIT_BASE		0xfffffd30
 #define AT91_WDT_BASE		0xfffffd40
-#define AT91_GPR_BASE		0xfffffd50
+/*
+ * The AT91SAM9XE has the GPBRs at a different address than
+ * the AT91SAM9260/9G20.
+ */
+#ifdef CONFIG_AT91SAM9XE
+# define AT91_GPR_BASE		0xfffffd60
+#else
+# define AT91_GPR_BASE		0xfffffd50
+#endif
 
 #ifdef CONFIG_AT91_LEGACY

@@ -140,10 +148,12 @@
 /*
  * Cpu Name
  */
-#if defined(CONFIG_AT91SAM9260)
-#define CONFIG_SYS_AT91_CPU_NAME	"AT91SAM9260"
+#if defined(CONFIG_AT91SAM9XE)
+# define CONFIG_SYS_AT91_CPU_NAME	"AT91SAM9XE"
+#elif defined(CONFIG_AT91SAM9260)
+# define CONFIG_SYS_AT91_CPU_NAME	"AT91SAM9260"
 #elif defined(CONFIG_AT91SAM9G20)
-#define CONFIG_SYS_AT91_CPU_NAME	"AT91SAM9G20"
+# define CONFIG_SYS_AT91_CPU_NAME	"AT91SAM9G20"
 #endif
 
 #endif

Signature · 1 line

1.5.6.5

Reinhard Meyer

author

2010-09-03 09:10 UTC #1 lore raw

PATCH v3 1/1 AT91: fix at91sam9260.h for AT91SAM9XE

Quoted 7 lines · Reinhard Meyer

Define the different location of the GPBRs for the 9XE Define the proper CPU Name
Signed-off-by Reinhard Meyer <[email protected]>
---
 arch/arm/include/asm/arch-at91/at91sam9260.h |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

Applied to u-boot-atmel/next
Thanks,
Reinhard