diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2007-11-09 11:48:34 +0100 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2007-11-09 11:48:34 +0100 |
| commit | 837edfec0e37f4de3b422fca6364e5434b346063 (patch) | |
| tree | 671059bf706c2140f15a2ff9147bb1cc03b7a3a6 | |
| parent | b9092e1a37163b45cc9afe3da766e9c2ab272f84 (diff) | |
| parent | be4a1c4accdde4d639b3f8af6d750c42bf06219b (diff) | |
| download | barebox-837edfec0e37f4de3b422fca6364e5434b346063.tar.gz barebox-837edfec0e37f4de3b422fca6364e5434b346063.tar.xz | |
Merge branch 'master' of ssh://rsc@octopus/home/git/projects/u-boot-v2
| -rw-r--r-- | drivers/net/fec_imx27.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/net/fec_imx27.c b/drivers/net/fec_imx27.c index 2a9368f806..e017d1eb23 100644 --- a/drivers/net/fec_imx27.c +++ b/drivers/net/fec_imx27.c @@ -333,21 +333,17 @@ static int fec_init(struct eth_device *dev) * Frame length=1518; MII mode; */ writel(0x05ee0024, &fec->eth->r_cntrl); /* FIXME 0x05ee0004 */ - /* * Set MII_SPEED = (1/(mii_speed * 2)) * System Clock * and do not drop the Preamble. */ writel(((imx_get_ahbclk() >> 20) / 5) << 1, &fec->eth->mii_speed); /* No MII for 7-wire mode */ } - /* * Set Opcode/Pause Duration Register */ writel(0x00010020, &fec->eth->op_pause); /* FIXME 0xffff0020; */ - writel(0x2, &fec->eth->x_wmrk); - /* * Set multicast address filter */ @@ -355,7 +351,7 @@ static int fec_init(struct eth_device *dev) writel(0x00000000, &fec->eth->gaddr2); /* size of each buffer */ - writel(2048-16, &fec->eth->emrbr); /* ???????????????????? */ + writel(FEC_MAX_PKT_SIZE, &fec->eth->emrbr); if (fec->xcv_type != SEVENWIRE) miiphy_restart_aneg(&fec->miiphy); @@ -372,7 +368,6 @@ static int fec_open(struct eth_device *edev) fec_priv *fec = (fec_priv *)edev->priv; writel(1 << 2, &fec->eth->x_cntrl); /* full-duplex, heartbeat disabled */ - fec->rbd_index = 0; /* @@ -452,9 +447,9 @@ static int fec_send(struct eth_device *dev, void *eth_data, int data_length) return -1; } - if ((uint32_t)eth_data & 0x0F) { + if ((uint32_t)eth_data & 0x0F) printf("%s: Warning: Transmitt data not aligned!\n", __FUNCTION__); - } + /* * Setup the transmitt buffer * Note: We are always using the first buffer for transmission, |