diff options
| author | Josh Wu <josh.wu@atmel.com> | 2012-10-31 18:19:48 +0800 |
|---|---|---|
| committer | Josh Wu <josh.wu@atmel.com> | 2012-10-31 18:19:48 +0800 |
| commit | a90f1d0717b76c7b8c1dbc711a4869ab3d309c99 (patch) | |
| tree | 83df86b8b208a0b93fbff777776814b6c42a432c | |
| parent | 3f139f7c833fe6f7ef272e4c97636f22f4dd3b6a (diff) | |
sam9x5: move get_chip_id() & get_extension_chip_id() to cpu.c
| -rw-r--r-- | arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c | 12 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/at91/cpu.c | 11 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-at91/at91sam9x5.h | 1 |
3 files changed, 11 insertions, 13 deletions
diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c index 6d77219d0d..d0d31da6f8 100644 --- a/arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c +++ b/arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c @@ -26,18 +26,6 @@ #include <asm/arch/gpio.h> #include <asm/io.h> -unsigned int get_chip_id(void) -{ - /* The 0x40 is the offset of cidr in DBGU */ - return readl(ATMEL_BASE_DBGU + 0x40) & ~ARCH_ID_VERSION_MASK; -} - -unsigned int get_extension_chip_id(void) -{ - /* The 0x44 is the offset of exid in DBGU */ - return readl(ATMEL_BASE_DBGU + 0x44); -} - unsigned int has_emac1() { return cpu_is_at91sam9x25(); diff --git a/arch/arm/cpu/arm926ejs/at91/cpu.c b/arch/arm/cpu/arm926ejs/at91/cpu.c index 5cf4fad0b0..351e19c398 100644 --- a/arch/arm/cpu/arm926ejs/at91/cpu.c +++ b/arch/arm/cpu/arm926ejs/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> @@ -71,3 +72,13 @@ int print_cpuinfo(void) return 0; } #endif + +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/at91sam9x5.h b/arch/arm/include/asm/arch-at91/at91sam9x5.h index 0e728c96dc..659c01d497 100644 --- a/arch/arm/include/asm/arch-at91/at91sam9x5.h +++ b/arch/arm/include/asm/arch-at91/at91sam9x5.h @@ -118,7 +118,6 @@ /* 9x5 series chip id definitions */ #define ARCH_ID_AT91SAM9X5 0x819a05a0 -#define ARCH_ID_VERSION_MASK 0x1f #define ARCH_EXID_AT91SAM9G15 0x00000000 #define ARCH_EXID_AT91SAM9G35 0x00000001 #define ARCH_EXID_AT91SAM9X35 0x00000002 |