|
@@ -370,7 +370,7 @@ static void r6040_init_mac_regs(struct net_device *dev)
|
|
/* Reset internal state machine */
|
|
/* Reset internal state machine */
|
|
iowrite16(2, ioaddr + MAC_SM);
|
|
iowrite16(2, ioaddr + MAC_SM);
|
|
iowrite16(0, ioaddr + MAC_SM);
|
|
iowrite16(0, ioaddr + MAC_SM);
|
|
- udelay(5000);
|
|
|
|
|
|
+ mdelay(5);
|
|
|
|
|
|
/* MAC Bus Control Register */
|
|
/* MAC Bus Control Register */
|
|
iowrite16(MBCR_DEFAULT, ioaddr + MBCR);
|
|
iowrite16(MBCR_DEFAULT, ioaddr + MBCR);
|
|
@@ -806,7 +806,7 @@ static void r6040_mac_address(struct net_device *dev)
|
|
iowrite16(0x01, ioaddr + MCR1); /* Reset MAC */
|
|
iowrite16(0x01, ioaddr + MCR1); /* Reset MAC */
|
|
iowrite16(2, ioaddr + MAC_SM); /* Reset internal state machine */
|
|
iowrite16(2, ioaddr + MAC_SM); /* Reset internal state machine */
|
|
iowrite16(0, ioaddr + MAC_SM);
|
|
iowrite16(0, ioaddr + MAC_SM);
|
|
- udelay(5000);
|
|
|
|
|
|
+ mdelay(5);
|
|
|
|
|
|
/* Restore MAC Address */
|
|
/* Restore MAC Address */
|
|
adrp = (u16 *) dev->dev_addr;
|
|
adrp = (u16 *) dev->dev_addr;
|