From d0b3264742340fd996631764494e189b8b770403 Mon Sep 17 00:00:00 2001 From: Bo Shen Date: Wed, 31 Oct 2012 16:31:36 +0800 Subject: sama5: add cpu id mask Signed-off-by: Bo Shen --- arch/arm/cpu/armv7/at91/at91sama5_devices.c | 2 +- arch/arm/include/asm/arch-at91/at91sama5.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv7/at91/at91sama5_devices.c b/arch/arm/cpu/armv7/at91/at91sama5_devices.c index 167b9f5bb3..cf29812aef 100644 --- a/arch/arm/cpu/armv7/at91/at91sama5_devices.c +++ b/arch/arm/cpu/armv7/at91/at91sama5_devices.c @@ -50,7 +50,7 @@ unsigned int get_chip_id(void) { - return readl(ATMEL_BASE_DBGU + CIDR); + return readl(ATMEL_BASE_DBGU + CIDR) & ~ARCH_ID_VERSION_MASK; } unsigned int get_extension_chip_id(void) diff --git a/arch/arm/include/asm/arch-at91/at91sama5.h b/arch/arm/include/asm/arch-at91/at91sama5.h index 38b9e9c7d9..d7378f4d94 100644 --- a/arch/arm/include/asm/arch-at91/at91sama5.h +++ b/arch/arm/include/asm/arch-at91/at91sama5.h @@ -76,7 +76,8 @@ #define ATMEL_ID_MPDDRC 49 /* sama5 series chip id definitions */ -#define ARCH_ID_AT91SAMA5 0x8a5c07c1 +#define ARCH_ID_AT91SAMA5 0x8a5c07c0 +#define ARCH_ID_VERSION_MASK 0x1f #define ARCH_EXID_AT91SAMA5D31 0x00444300 #define ARCH_EXID_AT91SAMA5D33 0x00414300 #define ARCH_EXID_AT91SAMA5D34 0x00414301 -- cgit v1.2.3