Update of /cvsroot/linux-mips/linux/drivers/net
In directory usw-pr-cvs1:/tmp/cvs-serv7382/drivers/net
Modified Files:
au1000_eth.c
Log Message:
* removed runtime copyright prints
* Added Pb1500 support (only pcmcia not working at this time) and
modified all drivers as necessary
* renamed most Au1000 registers to match latest databook
* better Au1000 usb hardware fixes for early silicon
* updated mtd driver to support Pb1500 partitioning
Index: au1000_eth.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/au1000_eth.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- au1000_eth.c 4 Dec 2001 03:05:58 -0000 1.7
+++ au1000_eth.c 15 Feb 2002 19:47:27 -0000 1.8
@@ -242,24 +242,11 @@
int lsi_80227_init(struct net_device *dev, int phy_addr)
{
- s16 mii_status = 0x0, timeout;
-
if (au1000_debug > 4)
printk("lsi_80227_init\n");
/* restart auto-negotiation */
mdio_write(dev, phy_addr, 0, 0x3200);
- /* wait for auto-negotiation ack */
- for (timeout = 4000; timeout > 0; --timeout) {
- mii_status = mdio_read(dev, phy_addr, MII_STATUS);
- if (mii_status & MII_STAT_AUTO_DONE)
- break;
- mdelay(1);
- }
- if (!(mii_status & MII_STAT_AUTO_DONE)) {
- printk(KERN_ERR "%s PHY auto-negotiation timeout !\n",
- dev->name);
- }
/* set up LEDs to correct display */
mdio_write(dev, phy_addr, 17, 0xffc0);
@@ -765,7 +752,7 @@
* will hang */
*aup->enable = MAC_EN_CLOCK_ENABLE;
au_sync_delay(2);
- *aup->enable |= MAC_EN_RESET0 | MAC_EN_RESET1 |
+ *aup->enable = MAC_EN_RESET0 | MAC_EN_RESET1 |
MAC_EN_RESET2 | MAC_EN_CLOCK_ENABLE;
au_sync_delay(2);
|
