diff options
| author | Josh Wu <josh.wu@atmel.com> | 2012-10-31 18:19:03 +0800 |
|---|---|---|
| committer | Josh Wu <josh.wu@atmel.com> | 2012-10-31 18:19:03 +0800 |
| commit | 3f139f7c833fe6f7ef272e4c97636f22f4dd3b6a (patch) | |
| tree | 828f56de3766e457db2cdce96dd301934f8ca82d | |
| parent | d0b3264742340fd996631764494e189b8b770403 (diff) | |
sama5: move get_chip_id() & get_extension_chip_id() to cpu.c
| -rw-r--r-- | arch/arm/cpu/armv7/at91/at91sama5_devices.c | 13 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/at91/cpu.c | 11 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-at91/at91_dbu.h | 4 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-at91/at91sama5.h | 1 |
4 files changed, 15 insertions, 14 deletions
diff --git a/arch/arm/cpu/armv7/at91/at91sama5_devices.c b/arch/arm/cpu/armv7/at91/at91sama5_devices.c index cf29812aef..2e421cb40f 100644 --- a/arch/arm/cpu/armv7/at91/at91sama5_devices.c +++ b/arch/arm/cpu/armv7/at91/at91sama5_devices.c @@ -45,19 +45,6 @@ # define PUP 0 #endif -#define CIDR 0x40 -#define EXID 0x44 - -unsigned int get_chip_id(void) -{ - return readl(ATMEL_BASE_DBGU + CIDR) & ~ARCH_ID_VERSION_MASK; -} - -unsigned int get_extension_chip_id(void) -{ - return readl(ATMEL_BASE_DBGU + EXID); -} - unsigned int has_emac() { return cpu_is_at91sama5d31() || cpu_is_at91sama5d35(); diff --git a/arch/arm/cpu/armv7/at91/cpu.c b/arch/arm/cpu/armv7/at91/cpu.c index 98102576f2..ebd7abd86f 100644 --- a/arch/arm/cpu/armv7/at91/cpu.c +++ b/arch/arm/cpu/armv7/at91/cpu.c @@ -26,6 +26,7 @@ #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> @@ -97,3 +98,13 @@ ulong bootcount_load (void) } #endif /* CONFIG_BOOTCOUNT_LIMIT */ + +unsigned int get_chip_id(void) +{ + return readl(ATMEL_BASE_DBGU + AT91_DBU_CIDR) & ~AT91_DBU_CIDR_VERSION; +} + +unsigned int get_extension_chip_id(void) +{ + return readl(ATMEL_BASE_DBGU + AT91_DBU_EXID); +} diff --git a/arch/arm/include/asm/arch-at91/at91_dbu.h b/arch/arm/include/asm/arch-at91/at91_dbu.h index 3429293535..fe64198aa0 100644 --- a/arch/arm/include/asm/arch-at91/at91_dbu.h +++ b/arch/arm/include/asm/arch-at91/at91_dbu.h @@ -38,4 +38,8 @@ typedef struct at91_dbu { #define AT91_DBU_CID_ARCH_9xx 0x01900000 #define AT91_DBU_CID_ARCH_9XExx 0x02900000 +#define AT91_DBU_CIDR_VERSION (0x1f << 0) +#define AT91_DBU_CIDR 0x40 +#define AT91_DBU_EXID 0x44 + #endif diff --git a/arch/arm/include/asm/arch-at91/at91sama5.h b/arch/arm/include/asm/arch-at91/at91sama5.h index d7378f4d94..f694431220 100644 --- a/arch/arm/include/asm/arch-at91/at91sama5.h +++ b/arch/arm/include/asm/arch-at91/at91sama5.h @@ -77,7 +77,6 @@ /* sama5 series chip id definitions */ #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 |