diff options
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r-- | drivers/net/tg3.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index e6da16a1f7bf..f61a4d8f012f 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -7072,30 +7072,6 @@ static int tg3_chip_reset(struct tg3 *tp) | |||
7072 | 7072 | ||
7073 | tg3_mdio_start(tp); | 7073 | tg3_mdio_start(tp); |
7074 | 7074 | ||
7075 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780) { | ||
7076 | u8 phy_addr; | ||
7077 | |||
7078 | phy_addr = tp->phy_addr; | ||
7079 | tp->phy_addr = TG3_PHY_PCIE_ADDR; | ||
7080 | |||
7081 | tg3_writephy(tp, TG3_PCIEPHY_BLOCK_ADDR, | ||
7082 | TG3_PCIEPHY_TXB_BLK << TG3_PCIEPHY_BLOCK_SHIFT); | ||
7083 | val = TG3_PCIEPHY_TX0CTRL1_TXOCM | TG3_PCIEPHY_TX0CTRL1_RDCTL | | ||
7084 | TG3_PCIEPHY_TX0CTRL1_TXCMV | TG3_PCIEPHY_TX0CTRL1_TKSEL | | ||
7085 | TG3_PCIEPHY_TX0CTRL1_NB_EN; | ||
7086 | tg3_writephy(tp, TG3_PCIEPHY_TX0CTRL1, val); | ||
7087 | udelay(10); | ||
7088 | |||
7089 | tg3_writephy(tp, TG3_PCIEPHY_BLOCK_ADDR, | ||
7090 | TG3_PCIEPHY_XGXS_BLK1 << TG3_PCIEPHY_BLOCK_SHIFT); | ||
7091 | val = TG3_PCIEPHY_PWRMGMT4_LOWPWR_EN | | ||
7092 | TG3_PCIEPHY_PWRMGMT4_L1PLLPD_EN; | ||
7093 | tg3_writephy(tp, TG3_PCIEPHY_PWRMGMT4, val); | ||
7094 | udelay(10); | ||
7095 | |||
7096 | tp->phy_addr = phy_addr; | ||
7097 | } | ||
7098 | |||
7099 | if ((tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) && | 7075 | if ((tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) && |
7100 | tp->pci_chip_rev_id != CHIPREV_ID_5750_A0 && | 7076 | tp->pci_chip_rev_id != CHIPREV_ID_5750_A0 && |
7101 | GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5785 && | 7077 | GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5785 && |