summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-06-14 20:31:36 +0200
committerWolfgang Denk <wd@denx.de>2009-06-14 20:31:36 +0200
commitc3147c1762f8caf99649051116a2411bdf887c10 (patch)
treeb1b671f684e058b6d52794308d3165fbf3690790
parente7563aff174f77aa61dab1ef5d9b47bebaa43702 (diff)
downloadu-boot-imx-c3147c1762f8caf99649051116a2411bdf887c10.zip
u-boot-imx-c3147c1762f8caf99649051116a2411bdf887c10.tar.gz
u-boot-imx-c3147c1762f8caf99649051116a2411bdf887c10.tar.bz2
Revert "SMC911x driver fixed for NFS boot"
This reverts commit ca9c8a1e10fac01e6a1129f82a7ce18bd818fa43, which causes compile warnings ("large integer implicitly truncated to unsigned type") on all systems that use this driver. The warning results from passing long constants (TX_CFG, RX_CFG) into smc911x_set_mac_csr() which is declared to accept "unsigned character" arguments only. Being close to a release, with nobody available to actually test the code or the suggested fixes, it seems better to revert the patch.
-rw-r--r--drivers/net/smc911x.c23
1 files changed, 1 insertions, 22 deletions
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 455b055..8c9a2a8 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -117,27 +117,6 @@ 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;
@@ -246,7 +225,7 @@ int eth_send(volatile void *packet, int length)
void eth_halt(void)
{
- smc911x_shutdown();
+ smc911x_reset();
}
int eth_rx(void)