aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/cxgb3/aq100x.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/cxgb3/aq100x.c')
-rw-r--r--drivers/net/cxgb3/aq100x.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/cxgb3/aq100x.c b/drivers/net/cxgb3/aq100x.c
index b1fd5bf836e4..341b7ef1508f 100644
--- a/drivers/net/cxgb3/aq100x.c
+++ b/drivers/net/cxgb3/aq100x.c
@@ -271,7 +271,8 @@ int t3_aq100x_phy_prep(struct cphy *phy, struct adapter *adapter, int phy_addr,
271 271
272 cphy_init(phy, adapter, phy_addr, &aq100x_ops, mdio_ops, 272 cphy_init(phy, adapter, phy_addr, &aq100x_ops, mdio_ops,
273 SUPPORTED_1000baseT_Full | SUPPORTED_10000baseT_Full | 273 SUPPORTED_1000baseT_Full | SUPPORTED_10000baseT_Full |
274 SUPPORTED_Autoneg | SUPPORTED_AUI, "1000/10GBASE-T"); 274 SUPPORTED_TP | SUPPORTED_Autoneg | SUPPORTED_AUI,
275 "1000/10GBASE-T");
275 276
276 /* 277 /*
277 * The PHY has been out of reset ever since the system powered up. So 278 * The PHY has been out of reset ever since the system powered up. So
@@ -316,11 +317,9 @@ int t3_aq100x_phy_prep(struct cphy *phy, struct adapter *adapter, int phy_addr,
316 317
317 /* Firmware version check. */ 318 /* Firmware version check. */
318 t3_mdio_read(phy, MDIO_MMD_VEND1, AQ_FW_VERSION, &v); 319 t3_mdio_read(phy, MDIO_MMD_VEND1, AQ_FW_VERSION, &v);
319 if (v != 30) { 320 if (v != 101)
320 CH_WARN(adapter, "PHY%d: unsupported firmware %d\n", 321 CH_WARN(adapter, "PHY%d: unsupported firmware %d\n",
321 phy_addr, v); 322 phy_addr, v);
322 return 0; /* allow t3_prep_adapter to succeed */
323 }
324 323
325 /* 324 /*
326 * The PHY should start in really-low-power mode. Prepare it for normal 325 * The PHY should start in really-low-power mode. Prepare it for normal