diff options
| author | Fabio Estevam <festevam@gmail.com> | 2011-12-20 05:46:31 +0000 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-01-16 08:40:09 +0100 |
| commit | be252b654a018cd9f513b0f2a5da4855a209c40c (patch) | |
| tree | d9314c6c7e5bc9e0c426f0996abc3cb2578d2d16 /arch/arm/cpu | |
| parent | 3c057897e9873fb95bfe6eae5e483d724670a288 (diff) | |
| download | u-boot-imx-be252b654a018cd9f513b0f2a5da4855a209c40c.zip u-boot-imx-be252b654a018cd9f513b0f2a5da4855a209c40c.tar.gz u-boot-imx-be252b654a018cd9f513b0f2a5da4855a209c40c.tar.bz2 | |
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>
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/arm1136/mx35/generic.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/mx25/generic.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/mx27/generic.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/soc.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/cpu/arm1136/mx35/generic.c b/arch/arm/cpu/arm1136/mx35/generic.c index ac4838f..d41613e 100644 --- a/arch/arm/cpu/arm1136/mx35/generic.c +++ b/arch/arm/cpu/arm1136/mx35/generic.c @@ -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); } diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c index c045a0b..9cadb7c 100644 --- a/arch/arm/cpu/arm926ejs/mx25/generic.c +++ b/arch/arm/cpu/arm926ejs/mx25/generic.c @@ -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; diff --git a/arch/arm/cpu/arm926ejs/mx27/generic.c b/arch/arm/cpu/arm926ejs/mx27/generic.c index 222a8e9..34c20e1 100644 --- a/arch/arm/cpu/arm926ejs/mx27/generic.c +++ b/arch/arm/cpu/arm926ejs/mx27/generic.c @@ -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; diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index dff5e4e..5a6f9e2 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -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]; |