diff options
| author | Manikandan Pillai <mani.pillai@ti.com> | 2009-04-08 09:08:00 +0530 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2009-10-21 16:46:32 -0400 |
| commit | ff0b91fdc9662dbfab1572e848fd405603bd9797 (patch) | |
| tree | b446b74f435db7199f356dcda1d4262f50ccb0c6 /drivers | |
| parent | e00079ccfdb82533460e6ef268958febd2db75ba (diff) | |
SMC911x driver fixed for NFS boot
eth_halt() function in the smc911x drivers used to call the
smc911x_reset() function. eth_halt() used to be called after
tftp transfers. This used to put the ethernet chip in reset
while the linux boots up resulting in the ethernet driver
not coming up. NFS boot used to fail as a result.
This patch calls smc911x_shutdown() instead of smc911x_reset().
Some comments received has also been fixed.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/smc911x.c | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 1ded8f01d0..5bc39141c8 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -116,6 +116,27 @@ static int smc911x_phy_reset(void) return 0; } +static void smc911x_shutdown(void) +{ + unsigned int cr; + + /* Turn of Rx and TX */ + cr = smc911x_get_mac_csr(MAC_CR); + cr &= ~(MAC_CR_TXEN | MAC_CR_RXEN | MAC_CR_HBDIS); + smc911x_set_mac_csr(MAC_CR, cr); + + /* Stop Transmission */ + cr = smc911x_get_mac_csr(TX_CFG); + cr &= ~(TX_CFG_STOP_TX); + smc911x_set_mac_csr(TX_CFG, cr); + /* Stop receiving packets */ + cr = smc911x_get_mac_csr(RX_CFG); + cr &= ~(RX_CFG_RXDOFF); + smc911x_set_mac_csr(RX_CFG, cr); + +} + + static void smc911x_phy_configure(void) { int timeout; @@ -224,7 +245,7 @@ int eth_send(volatile void *packet, int length) void eth_halt(void) { - smc911x_reset(); + smc911x_shutdown(); } int eth_rx(void) |