Merge branch 'master' of git://git.denx.de/u-boot-spi

[u-boot] / arch / arm / mach-at91 / armv7 / cpu.c

diff --git a/arch/arm/mach-at91/armv7/cpu.c b/arch/arm/mach-at91/armv7/cpu.c
index 8d86f97e3dab36be1b26af44ec9999a2c4d3a477..18653039fe2fdb12fe9f893f530afc42e8cd724a 100644 (file)
--- a/arch/arm/mach-at91/armv7/cpu.c
+++ b/arch/arm/mach-at91/armv7/cpu.c
@@ -12,8 +12,6 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
-#include <asm/arch/at91_dbu.h>
-#include <asm/arch/at91_pmc.h>
 #include <asm/arch/at91_pit.h>
 #include <asm/arch/at91_gpbr.h>
 #include <asm/arch/clk.h>
@@ -65,12 +63,14 @@ void enable_caches(void)
        dcache_enable();
 }
 
+#define ATMEL_CHIPID_CIDR_VERSION      0x1f
+
 unsigned int get_chip_id(void)
 {
-       return readl(ATMEL_BASE_DBGU + AT91_DBU_CIDR) & ~AT91_DBU_CIDR_MASK;
+       return readl(ATMEL_CHIPID_CIDR) & ~ATMEL_CHIPID_CIDR_VERSION;
 }
 
 unsigned int get_extension_chip_id(void)
 {
-       return readl(ATMEL_BASE_DBGU + AT91_DBU_EXID);
+       return readl(ATMEL_CHIPID_EXID);
 }