diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-02-08 10:18:48 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-11 09:34:50 +0100 |
| commit | 36bcee4892f7121bbb5121b67f66a78a411dd421 (patch) | |
| tree | eec6099d52819f1fa415bb7c12be284723d4e3c2 /drivers/net/macb.c | |
| parent | 044cb6a298d14f1290bc626ecc91143734e38085 (diff) | |
| download | barebox-36bcee4892f7121bbb5121b67f66a78a411dd421.tar.gz barebox-36bcee4892f7121bbb5121b67f66a78a411dd421.tar.xz | |
net macb: reset the IP at init
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Tested-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net/macb.c')
| -rw-r--r-- | drivers/net/macb.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 30265075db..d6b60aaaa3 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -374,6 +374,23 @@ static int macb_set_ethaddr(struct eth_device *edev, unsigned char *adr) return 0; } +static void macb_reset_hw(struct macb_device *bp) +{ + /* Disable RX and TX forcefully */ + macb_writel(bp, NCR, 0); + + /* Clear the stats registers (XXX: Update stats first?) */ + macb_writel(bp, NCR, MACB_BIT(CLRSTAT)); + + /* Clear all status flags */ + macb_writel(bp, TSR, -1); + macb_writel(bp, RSR, -1); + + /* Disable all interrupts */ + macb_writel(bp, IDR, -1); + macb_readl(bp, ISR); +} + static int macb_probe(struct device_d *dev) { struct eth_device *edev; @@ -433,6 +450,9 @@ static int macb_probe(struct device_d *dev) } clk_enable(pclk); + + macb_reset_hw(macb); + macb_hz = clk_get_rate(pclk); if (macb_hz < 20000000) ncfgr = MACB_BF(CLK, MACB_CLK_DIV8); @@ -443,6 +463,9 @@ static int macb_probe(struct device_d *dev) else ncfgr = MACB_BF(CLK, MACB_CLK_DIV64); + + ncfgr |= MACB_BIT(PAE); /* PAuse Enable */ + ncfgr |= MACB_BIT(DRFCS); /* Discard Rx FCS */ macb_writel(macb, NCFGR, ncfgr); macb_init(macb); |