diff options
| author | Tom Rini <trini@konsulko.com> | 2015-09-02 10:39:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-09-02 10:39:28 -0400 |
| commit | 0ffadab1b9ab59816a0f71c927604bb6c402d863 (patch) | |
| tree | 8338cea40ce53158387da4f708b09487cdebeaf9 /drivers/net | |
| parent | 6923b069bd50b3ac519b16b6ae6aabbd2984c391 (diff) | |
| parent | 37cf215253a488ba6b903989b1eff072f59d266e (diff) | |
| download | u-boot-imx-0ffadab1b9ab59816a0f71c927604bb6c402d863.zip u-boot-imx-0ffadab1b9ab59816a0f71c927604bb6c402d863.tar.gz u-boot-imx-0ffadab1b9ab59816a0f71c927604bb6c402d863.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/fec_mxc.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index c5dcbbb..bff5fd1 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -17,6 +17,7 @@ #include <asm/arch/clock.h> #include <asm/arch/imx-regs.h> +#include <asm/imx-common/sys_proto.h> #include <asm/io.h> #include <asm/errno.h> #include <linux/compiler.h> @@ -551,12 +552,15 @@ static int fec_init(struct eth_device *dev, bd_t* bd) writel(0x00000000, &fec->eth->gaddr2); - /* clear MIB RAM */ - for (i = mib_ptr; i <= mib_ptr + 0xfc; i += 4) - writel(0, i); + /* Do not access reserved register for i.MX6UL */ + if (!is_cpu_type(MXC_CPU_MX6UL)) { + /* clear MIB RAM */ + for (i = mib_ptr; i <= mib_ptr + 0xfc; i += 4) + writel(0, i); - /* FIFO receive start register */ - writel(0x520, &fec->eth->r_fstart); + /* FIFO receive start register */ + writel(0x520, &fec->eth->r_fstart); + } /* size and address of each buffer */ writel(FEC_MAX_PKT_SIZE, &fec->eth->emrbr); |