Merge branch 'next' of git://git.denx.de/u-boot-video

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

diff --git a/arch/arm/mach-at91/include/mach/sama5d3.h b/arch/arm/mach-at91/include/mach/sama5d3.h
index 227ba8082551b039e8ace1d7ee77ad3e70abd60b..0d32e3900f92ac6554f3b917de9e630edd19b57e 100644 (file)
--- a/arch/arm/mach-at91/include/mach/sama5d3.h
+++ b/arch/arm/mach-at91/include/mach/sama5d3.h
@@ -13,11 +13,6 @@
 #ifndef SAMA5D3_H
 #define SAMA5D3_H
 
-/*
- * defines to be used in other places
- */
-#define CONFIG_AT91FAMILY      /* it's a member of AT91 */
-
 /*
  * Peripheral identifiers/interrupts.
  */
@@ -158,6 +153,9 @@
 #define ATMEL_BASE_RTC         0xfffffeb0
 /* Reserved:   0xfffffee0 - 0xffffffff */
 
+#define ATMEL_CHIPID_CIDR      0xffffee40
+#define ATMEL_CHIPID_EXID      0xffffee44
+
 /*
  * Internal Memory.
  */
@@ -185,10 +183,11 @@
  * Other misc defines
  */
 #define ATMEL_PIO_PORTS                5
-#define CPU_HAS_PIO3
-#define PIO_SCDR_DIV           0x3fff
 #define CPU_HAS_PCR
 
+/* Timer */
+#define CONFIG_SYS_TIMER_COUNTER       0xfffffe3c
+
 /*
  * PMECC table in ROM
  */