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

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

diff --git a/arch/arm/mach-at91/include/mach/at91sam9g45.h b/arch/arm/mach-at91/include/mach/at91sam9g45.h
index 6df8cdb56d07bb72501272b45e517976b017c56d..96922c4e6bc7782d8d1782fe91b91a253262e6ee 100644 (file)
--- a/arch/arm/mach-at91/include/mach/at91sam9g45.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9g45.h
@@ -12,11 +12,6 @@
 #ifndef AT91SAM9G45_H
 #define AT91SAM9G45_H
 
-/*
- * defines to be used in other places
- */
-#define CONFIG_AT91FAMILY      /* it's a member of AT91 */
-
 /*
  * Peripheral identifiers/interrupts.
  */
@@ -109,6 +104,7 @@
 #define ATMEL_BASE_RTT         0xfffffd20
 #define ATMEL_BASE_PIT         0xfffffd30
 #define ATMEL_BASE_WDT         0xfffffd40
+#define ATMEL_BASE_SCKCR       0xfffffd50
 #define ATMEL_BASE_GPBR                0xfffffd60
 #define ATMEL_BASE_RTC         0xfffffdb0
 /* Reserved:   0xfffffdc0 - 0xffffffff */
@@ -136,6 +132,9 @@
 #define ATMEL_BASE_CS6         0x70000000
 #define ATMEL_BASE_CS7         0x80000000
 
+/* Timer */
+#define CONFIG_SYS_TIMER_COUNTER       0xfffffd3c
+
 /*
  * Other misc defines
  */