leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: at91: Change the Chip ID registers' addresses

Browse Source 
Provide the specific addresses for the Chip ID and Chip ID Extension
registers, instead of the offset, which make it use on other chips.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com>
This commit is contained in:
Wenyou Yang 2015-09-08 14:38:26 +08:00 committed by Andreas Bießmann
parent 96d59e9d6a
commit ce39680f7e
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-at91/armv7/cpu.c
View File

@ -12,7 +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>
@ -65,12 +64,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);
}

4
arch/arm/mach-at91/include/mach/at91_dbu.h
View File

@ -35,8 +35,4 @@ typedef struct at91_dbu {
#define AT91_DBU_CID_ARCH_9xx 0x01900000
#define AT91_DBU_CID_ARCH_9XExx 0x02900000
#define AT91_DBU_CIDR_MASK 0x1f
#define AT91_DBU_CIDR 0x40
#define AT91_DBU_EXID 0x44
#endif

3
arch/arm/mach-at91/include/mach/sama5d3.h
View File

@ -158,6 +158,9 @@
#define ATMEL_BASE_RTC 0xfffffeb0
/* Reserved: 0xfffffee0 - 0xffffffff */
#define ATMEL_CHIPID_CIDR 0xffffee40
#define ATMEL_CHIPID_EXID 0xffffee44
/*
* Internal Memory.
*/

3
arch/arm/mach-at91/include/mach/sama5d4.h
View File

@ -144,6 +144,9 @@
#define ATMEL_BASE_PIOE 0xfc06d000
#define ATMEL_BASE_AIC 0xfc06e000
#define ATMEL_CHIPID_CIDR 0xfc069040
#define ATMEL_CHIPID_EXID 0xfc069044
/*
* Internal Memory.
*/