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

net: imx: Add multi-FEC support for imx_get_mac_from_fuse 

Add multi-FEC support for imx_get_mac_from_fuse by passing dev_id as a parameter.

This feature is important on mx28 SoC for example that has two FEC ports.

Cc: Ben Warren <biggerbadderben@gmail.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>
This commit is contained in:
Fabio Estevam 2011-12-20 05:46:31 +00:00 committed by Albert ARIBAUD
parent 3c057897e9
commit be252b654a
8 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/arm1136/mx35/generic.c
View File

@ -393,7 +393,7 @@ unsigned int mxc_get_clock(enum mxc_clock clk)
/*
* The MX35 has no fuse for MAC, return a NULL MAC
*/
void imx_get_mac_from_fuse(unsigned char *mac)
void imx_get_mac_from_fuse(int dev_id, unsigned char *mac)
{
memset(mac, 0, 6);
}

2
arch/arm/cpu/arm926ejs/mx25/generic.c
View File

@ -312,7 +312,7 @@ void mx25_fec_init_pins(void)
}
void imx_get_mac_from_fuse(unsigned char *mac)
void imx_get_mac_from_fuse(int dev_id, unsigned char *mac)
{
int i;
struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;

2
arch/arm/cpu/arm926ejs/mx27/generic.c
View File

@ -314,7 +314,7 @@ void mx27_fec_init_pins(void)
imx_gpio_mode(mode[i]);
}
void imx_get_mac_from_fuse(unsigned char *mac)
void imx_get_mac_from_fuse(int dev_id, unsigned char *mac)
{
int i;
struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;

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

@ -63,7 +63,7 @@ int arch_cpu_init(void)
#endif
#if defined(CONFIG_FEC_MXC)
void imx_get_mac_from_fuse(unsigned char *mac)
void imx_get_mac_from_fuse(int dev_id, unsigned char *mac)
{
struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
struct fuse_bank *bank = &iim->bank[4];

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

@ -167,7 +167,7 @@
#if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__))
#include <asm/types.h>
extern void imx_get_mac_from_fuse(unsigned char *mac);
extern void imx_get_mac_from_fuse(int dev_id, unsigned char *mac);
/* System Reset Controller (SRC) */
struct src {

4
board/denx/m28evk/m28evk.c
View File

@ -181,7 +181,7 @@ int board_eth_init(bd_t *bis)
#ifdef CONFIG_M28_FEC_MAC_IN_OCOTP
#define MXS_OCOTP_MAX_TIMEOUT 1000000
void imx_get_mac_from_fuse(char *mac)
void imx_get_mac_from_fuse(int dev_id, char *mac)
{
struct mx28_ocotp_regs *ocotp_regs =
(struct mx28_ocotp_regs *)MXS_OCOTP_BASE;
@ -207,7 +207,7 @@ void imx_get_mac_from_fuse(char *mac)
mac[5] = data & 0xff;
}
#else
void imx_get_mac_from_fuse(char *mac)
void imx_get_mac_from_fuse(int dev_id, char *mac)
{
memset(mac, 0, 6);
}

9
drivers/net/fec_mxc.c
View File

@ -345,9 +345,10 @@ static void fec_rbd_clean(int last, struct fec_bd *pRbd)
writew(0, &pRbd->data_length);
}
static int fec_get_hwaddr(struct eth_device *dev, unsigned char *mac)
static int fec_get_hwaddr(struct eth_device *dev, int dev_id,
unsigned char *mac)
{
imx_get_mac_from_fuse(mac);
imx_get_mac_from_fuse(dev_id, mac);
return !is_valid_ether_addr(mac);
}
@ -822,8 +823,8 @@ static int fec_probe(bd_t *bd, int dev_id, int phy_id, uint32_t base_addr)
eth_register(edev);
if (fec_get_hwaddr(edev, ethaddr) == 0) {
debug("got MAC address from fuse: %pM\n", ethaddr);
if (fec_get_hwaddr(edev, dev_id, ethaddr) == 0) {
debug("got MAC%d address from fuse: %pM\n", dev_id, ethaddr);
memcpy(edev->enetaddr, ethaddr, 6);
}

2
drivers/net/fec_mxc.h
View File

@ -32,7 +32,7 @@
#ifndef __FEC_MXC_H
#define __FEC_MXC_H
void imx_get_mac_from_fuse(unsigned char *mac);
void imx_get_mac_from_fuse(int dev_id, unsigned char *mac);
/**
* Layout description of the FEC