summaryrefslogtreecommitdiff
path: root/arch/arm/cpu
diff options
context:
space:
mode:
authorPaul Kocialkowski <contact@paulk.fr>2015-08-27 19:37:09 +0200
committerTom Rini <trini@konsulko.com>2015-10-22 14:17:18 -0400
commitb50a7685283b66623a6acb60329c57caa78795f5 (patch)
tree05bdfc9d331e7c727df827fb0d8c34c38e4edb87 /arch/arm/cpu
parent72931b15e7a49840a3c439096e4966400e60c65e (diff)
downloadu-boot-imx-b50a7685283b66623a6acb60329c57caa78795f5.zip
u-boot-imx-b50a7685283b66623a6acb60329c57caa78795f5.tar.gz
u-boot-imx-b50a7685283b66623a6acb60329c57caa78795f5.tar.bz2
omap3: omap_die_id support
This replaces the previous get_dieid definition with omap_die_id, that matches the common omap_die_id definition. Signed-off-by: Paul Kocialkowski <contact@paulk.fr> Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r--arch/arm/cpu/armv7/omap3/sys_info.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/arm/cpu/armv7/omap3/sys_info.c b/arch/arm/cpu/armv7/omap3/sys_info.c
index ab60a03..497dc13 100644
--- a/arch/arm/cpu/armv7/omap3/sys_info.c
+++ b/arch/arm/cpu/armv7/omap3/sys_info.c
@@ -42,17 +42,14 @@ static char *rev_s_37xx[CPU_37XX_MAX_REV] = {
"1.2"};
#endif /* CONFIG_DISPLAY_CPUINFO */
-/*****************************************************************
- * get_dieid(u32 *id) - read die ID
- *****************************************************************/
-void get_dieid(u32 *id)
+void omap_die_id(unsigned int *die_id)
{
struct ctrl_id *id_base = (struct ctrl_id *)OMAP34XX_ID_L4_IO_BASE;
- id[3] = readl(&id_base->die_id_0);
- id[2] = readl(&id_base->die_id_1);
- id[1] = readl(&id_base->die_id_2);
- id[0] = readl(&id_base->die_id_3);
+ die_id[0] = readl(&id_base->die_id_0);
+ die_id[1] = readl(&id_base->die_id_1);
+ die_id[2] = readl(&id_base->die_id_2);
+ die_id[3] = readl(&id_base->die_id_3);
}
/*****************************************************************
@@ -68,7 +65,7 @@ void dieid_num_r(void)
uid_s = getenv("dieid#");
if (uid_s == NULL) {
- get_dieid(id);
+ omap_die_id(id);
sprintf(die_id, "%08x%08x%08x%08x", id[0], id[1], id[2], id[3]);
setenv("dieid#", die_id);
uid_s = die_id;