diff options
| author | Juergen Beisert <jbe@pengutronix.de> | 2010-12-13 11:53:34 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-12-14 15:15:07 +0100 |
| commit | 07965c6fa14d8e7e3dedd1bdd07cd789c50b9d97 (patch) | |
| tree | 2ebd2ee8c95383ec6c0addbc0427bb8f4900063f | |
| parent | 0df242defb72184394cbcbb9742ab6a9dfcfd0b3 (diff) | |
| download | barebox-07965c6fa14d8e7e3dedd1bdd07cd789c50b9d97.tar.gz barebox-07965c6fa14d8e7e3dedd1bdd07cd789c50b9d97.tar.xz | |
Fixup the FEC driver files
Some register bits are not defined in the IMX CPUs using this FEC (at least
I did not find anything about them in the related datasheets) and they will
get (partially) a new meaning in the i.MX28 CPU. So, removing them from the
source seems the best way to avoid any accidental usage on i.MX28.
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/net/fec_imx.c | 3 | ||||
| -rw-r--r-- | drivers/net/fec_imx.h | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c index 9c8de77d..91ef9299 100644 --- a/drivers/net/fec_imx.c +++ b/drivers/net/fec_imx.c @@ -476,8 +476,7 @@ static int fec_recv(struct eth_device *dev) ievent = readl(fec->regs + FEC_IEVENT); writel(ievent, fec->regs + FEC_IEVENT); - if (ievent & (FEC_IEVENT_BABT | FEC_IEVENT_XFIFO_ERROR | - FEC_IEVENT_RFIFO_ERROR)) { + if (ievent & FEC_IEVENT_BABT) { /* BABT, Rx/Tx FIFO errors */ fec_halt(dev); fec_init(dev); diff --git a/drivers/net/fec_imx.h b/drivers/net/fec_imx.h index ce0fd89e..f7fbdc99 100644 --- a/drivers/net/fec_imx.h +++ b/drivers/net/fec_imx.h @@ -73,8 +73,6 @@ #define FEC_IEVENT_LATE_COL 0x00200000 #define FEC_IEVENT_COL_RETRY_LIM 0x00100000 #define FEC_IEVENT_XFIFO_UN 0x00080000 -#define FEC_IEVENT_XFIFO_ERROR 0x00040000 -#define FEC_IEVENT_RFIFO_ERROR 0x00020000 #define FEC_IMASK_HBERR 0x80000000 #define FEC_IMASK_BABR 0x40000000 @@ -84,8 +82,6 @@ #define FEC_IMASK_LATE_COL 0x00200000 #define FEC_IMASK_COL_RETRY_LIM 0x00100000 #define FEC_IMASK_XFIFO_UN 0x00080000 -#define FEC_IMASK_XFIFO_ERROR 0x00040000 -#define FEC_IMASK_RFIFO_ERROR 0x00020000 #define FEC_RCNTRL_MAX_FL_SHIFT 16 #define FEC_RCNTRL_LOOP 0x01 |