diff options
| -rw-r--r-- | drivers/net/ethernet/dec/tulip/dmfe.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c b/drivers/net/ethernet/dec/tulip/dmfe.c index 0ef5b68acd05..4d6fe604fa64 100644 --- a/drivers/net/ethernet/dec/tulip/dmfe.c +++ b/drivers/net/ethernet/dec/tulip/dmfe.c | |||
| @@ -767,7 +767,7 @@ static int dmfe_stop(struct DEVICE *dev) | |||
| 767 | 767 | ||
| 768 | /* Reset & stop DM910X board */ | 768 | /* Reset & stop DM910X board */ |
| 769 | dw32(DCR0, DM910X_RESET); | 769 | dw32(DCR0, DM910X_RESET); |
| 770 | udelay(5); | 770 | udelay(100); |
| 771 | phy_write(ioaddr, db->phy_addr, 0, 0x8000, db->chip_id); | 771 | phy_write(ioaddr, db->phy_addr, 0, 0x8000, db->chip_id); |
| 772 | 772 | ||
| 773 | /* free interrupt */ | 773 | /* free interrupt */ |
| @@ -1601,7 +1601,9 @@ static u16 read_srom_word(void __iomem *ioaddr, int offset) | |||
| 1601 | int i; | 1601 | int i; |
| 1602 | 1602 | ||
| 1603 | dw32(DCR9, CR9_SROM_READ); | 1603 | dw32(DCR9, CR9_SROM_READ); |
| 1604 | udelay(5); | ||
| 1604 | dw32(DCR9, CR9_SROM_READ | CR9_SRCS); | 1605 | dw32(DCR9, CR9_SROM_READ | CR9_SRCS); |
| 1606 | udelay(5); | ||
| 1605 | 1607 | ||
| 1606 | /* Send the Read Command 110b */ | 1608 | /* Send the Read Command 110b */ |
| 1607 | srom_clk_write(ioaddr, SROM_DATA_1); | 1609 | srom_clk_write(ioaddr, SROM_DATA_1); |
| @@ -1615,6 +1617,7 @@ static u16 read_srom_word(void __iomem *ioaddr, int offset) | |||
| 1615 | } | 1617 | } |
| 1616 | 1618 | ||
| 1617 | dw32(DCR9, CR9_SROM_READ | CR9_SRCS); | 1619 | dw32(DCR9, CR9_SROM_READ | CR9_SRCS); |
| 1620 | udelay(5); | ||
| 1618 | 1621 | ||
| 1619 | for (i = 16; i > 0; i--) { | 1622 | for (i = 16; i > 0; i--) { |
| 1620 | dw32(DCR9, CR9_SROM_READ | CR9_SRCS | CR9_SRCLK); | 1623 | dw32(DCR9, CR9_SROM_READ | CR9_SRCS | CR9_SRCLK); |
| @@ -1626,6 +1629,7 @@ static u16 read_srom_word(void __iomem *ioaddr, int offset) | |||
| 1626 | } | 1629 | } |
| 1627 | 1630 | ||
| 1628 | dw32(DCR9, CR9_SROM_READ); | 1631 | dw32(DCR9, CR9_SROM_READ); |
| 1632 | udelay(5); | ||
| 1629 | return srom_data; | 1633 | return srom_data; |
| 1630 | } | 1634 | } |
| 1631 | 1635 | ||
