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

mx6: soc: Add ENET2 mac address support

Browse Source 
The i.MX6SX and i.MX6UL has two ENET controllers, add support for reading
MAC address from fuse for ENET2.

Signed-off-by: Ye Li <ye.li@nxp.com>
This commit is contained in:
Ye Li 2016-02-01 10:41:31 +08:00 committed by Stefano Babic
parent 276d3ebb88
commit d4d1dd6749
3 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
arch/arm/cpu/armv7/mx6/soc.c
View File

@ -364,15 +364,29 @@ void imx_get_mac_from_fuse(int dev_id, unsigned char *mac)
struct fuse_bank4_regs *fuse = struct fuse_bank4_regs *fuse =
(struct fuse_bank4_regs *)bank->fuse_regs; (struct fuse_bank4_regs *)bank->fuse_regs;
u32 value = readl(&fuse->mac_addr_high); if ((is_cpu_type(MXC_CPU_MX6SX) || is_cpu_type(MXC_CPU_MX6UL)) &&
mac[0] = (value >> 8); dev_id == 1) {
mac[1] = value ; u32 value = readl(&fuse->mac_addr2);
mac[0] = value >> 24 ;
mac[1] = value >> 16 ;
mac[2] = value >> 8 ;
mac[3] = value ;
value = readl(&fuse->mac_addr_low); value = readl(&fuse->mac_addr1);
mac[2] = value >> 24 ; mac[4] = value >> 24 ;
mac[3] = value >> 16 ; mac[5] = value >> 16 ;
mac[4] = value >> 8 ;
mac[5] = value ; } else {
u32 value = readl(&fuse->mac_addr1);
mac[0] = (value >> 8);
mac[1] = value ;
value = readl(&fuse->mac_addr0);
mac[2] = value >> 24 ;
mac[3] = value >> 16 ;
mac[4] = value >> 8 ;
mac[5] = value ;
}
} }
#endif #endif

23
arch/arm/include/asm/arch-mx6/imx-regs.h
View File

@ -715,39 +715,22 @@ struct fuse_bank1_regs {
u32 rsvd7[3]; u32 rsvd7[3];
}; };
#if (defined(CONFIG_MX6SX) || defined(CONFIG_MX6UL))
struct fuse_bank4_regs { struct fuse_bank4_regs {
u32 sjc_resp_low; u32 sjc_resp_low;
u32 rsvd0[3]; u32 rsvd0[3];
u32 sjc_resp_high; u32 sjc_resp_high;
u32 rsvd1[3]; u32 rsvd1[3];
u32 mac_addr_low; u32 mac_addr0;
u32 rsvd2[3]; u32 rsvd2[3];
u32 mac_addr_high; u32 mac_addr1;
u32 rsvd3[3]; u32 rsvd3[3];
u32 mac_addr2; u32 mac_addr2; /*For i.MX6SX and i.MX6UL*/
u32 rsvd4[7]; u32 rsvd4[7];
u32 gp1; u32 gp1;
u32 rsvd5[3]; u32 rsvd5[3];
u32 gp2; u32 gp2;
u32 rsvd6[3]; u32 rsvd6[3];
}; };
#else
struct fuse_bank4_regs {
u32 sjc_resp_low;
u32 rsvd0[3];
u32 sjc_resp_high;
u32 rsvd1[3];
u32 mac_addr_low;
u32 rsvd2[3];
u32 mac_addr_high;
u32 rsvd3[0xb];
u32 gp1;
u32 rsvd4[3];
u32 gp2;
u32 rsvd5[3];
};
#endif
struct aipstz_regs { struct aipstz_regs {
u32 mprot0; u32 mprot0;

5
doc/README.imx6
View File

@ -7,7 +7,10 @@ SoC.
----------------------------------- -----------------------------------
1.1 MAC Address: It is stored in fuse bank 4, with the 32 lsbs in word 2 and the 1.1 MAC Address: It is stored in fuse bank 4, with the 32 lsbs in word 2 and the
16 msbs in word 3. 16 msbs in word 3[15:0].
For i.MX6SX and i.MX6UL, they have two MAC addresses. The second MAC address
is stored in fuse bank 4, with the 16 lsb in word 3[31:16] and the 32 msbs in
word 4.
Example: Example: