diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-12-09 20:52:44 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-12-09 20:52:44 +0100 |
| commit | ac8983bcba75576c50307b5e8dc8fb848740ee61 (patch) | |
| tree | e514ad2f915afd2af270d13bce4eb15605887283 /arch/arm/include/asm/arch-mx25/imx-regs.h | |
| parent | 7ea23555f5d59457f5998b9f61d7b943b2ea6422 (diff) | |
| parent | 565e39c57769a45a5eaed5e4c86357e817cf64e1 (diff) | |
| download | u-boot-imx-ac8983bcba75576c50307b5e8dc8fb848740ee61.zip u-boot-imx-ac8983bcba75576c50307b5e8dc8fb848740ee61.tar.gz u-boot-imx-ac8983bcba75576c50307b5e8dc8fb848740ee61.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-imx
Diffstat (limited to 'arch/arm/include/asm/arch-mx25/imx-regs.h')
| -rw-r--r-- | arch/arm/include/asm/arch-mx25/imx-regs.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/arch/arm/include/asm/arch-mx25/imx-regs.h b/arch/arm/include/asm/arch-mx25/imx-regs.h index f5a2929..55ad115 100644 --- a/arch/arm/include/asm/arch-mx25/imx-regs.h +++ b/arch/arm/include/asm/arch-mx25/imx-regs.h @@ -36,6 +36,7 @@ #ifndef __ASSEMBLY__ #ifdef CONFIG_FEC_MXC extern void mx25_fec_init_pins(void); +extern void imx_get_mac_from_fuse(unsigned char *mac); #endif /* Clock Control Module (CCM) registers */ @@ -129,12 +130,17 @@ struct iim_regs { u32 iim_srev; u32 iim_prog_p; u32 res1[0x1f5]; - u32 iim_bank_area0[0x20]; - u32 res2[0xe0]; - u32 iim_bank_area1[0x20]; - u32 res3[0xe0]; - u32 iim_bank_area2[0x20]; + struct fuse_bank { + u32 fuse_regs[0x20]; + u32 fuse_rsvd[0xe0]; + } bank[3]; }; + +struct fuse_bank0_regs { + u32 fuse0_25[0x1a]; + u32 mac_addr[6]; +}; + #endif /* AIPS 1 */ @@ -312,7 +318,4 @@ struct iim_regs { #define WSR_UNLOCK1 0x5555 #define WSR_UNLOCK2 0xAAAA -/* FUSE bank offsets */ -#define IIM0_MAC 0x1a - #endif /* _IMX_REGS_H */ |