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

omap4: omap_die_id support

Browse Source 
This introduces omap4 support for omap_die_id, which matches the common
omap_die_id definition. It replaces board-specific code to grab the die id bits.

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Paul Kocialkowski 2015-08-27 19:37:10 +02:00 committed by Tom Rini
parent b50a768528
commit 987a40d52e
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/cpu/armv7/omap4/hwinit.c
View File

@ -156,6 +156,14 @@ void init_omap_revision(void)
}
}
void omap_die_id(unsigned int *die_id)
{
die_id[0] = readl((*ctrl)->control_std_fuse_die_id_0);
die_id[1] = readl((*ctrl)->control_std_fuse_die_id_1);
die_id[2] = readl((*ctrl)->control_std_fuse_die_id_2);
die_id[3] = readl((*ctrl)->control_std_fuse_die_id_3);
}
#ifndef CONFIG_SYS_L2CACHE_OFF
void v7_outer_cache_enable(void)
{

5
arch/arm/cpu/armv7/omap4/prcm-regs.c
View File

@ -280,7 +280,10 @@ struct prcm_regs const omap4_prcm = {
struct omap_sys_ctrl_regs const omap4_ctrl = {
.control_status = 0x4A0022C4,
.control_id_code = 0x4A002204,
.control_std_fuse_die_id_0 = 0x4A002200,
.control_std_fuse_die_id_1 = 0x4A002208,
.control_std_fuse_die_id_2 = 0x4A00220C,
.control_std_fuse_die_id_3 = 0x4A002210,
.control_std_fuse_opp_bgap = 0x4a002260,
.control_status = 0x4a0022c4,
.control_ldosram_iva_voltage_ctrl = 0x4A002320,

4
arch/arm/include/asm/arch-omap4/omap.h
View File

@ -33,10 +33,6 @@
/* CONTROL_ID_CODE */
#define CONTROL_ID_CODE 0x4A002204
#define STD_FUSE_DIE_ID_0 0x4A002200
#define STD_FUSE_DIE_ID_1 0x4A002208
#define STD_FUSE_DIE_ID_2 0x4A00220c
#define STD_FUSE_DIE_ID_3 0x4A002210
#define OMAP4_CONTROL_ID_CODE_ES1_0 0x0B85202F
#define OMAP4_CONTROL_ID_CODE_ES2_0 0x1B85202F

9
board/ti/panda/panda.c
View File

@ -209,7 +209,7 @@ int misc_init_r(void)
{
int phy_type;
u32 auxclk, altclksrc;
u32 id[4];
unsigned int die_id[4] = { 0 };
/* EHCI is not supported on ES1.0 */
if (omap_revision() == OMAP4430_ES1_0)
@ -263,11 +263,8 @@ int misc_init_r(void)
writel(altclksrc, &scrm->altclksrc);
id[0] = readl(STD_FUSE_DIE_ID_0);
id[1] = readl(STD_FUSE_DIE_ID_1);
id[2] = readl(STD_FUSE_DIE_ID_2);
id[3] = readl(STD_FUSE_DIE_ID_3);
usb_fake_mac_from_die_id(id);
omap_die_id(die_id);
usb_fake_mac_from_die_id(die_id);
return 0;
}