diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2008-12-13 07:00:17 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-13 07:00:17 +0100 |
commit | e6fa2eb789f49dc51a20d3db0d410bc8158abb43 (patch) | |
tree | 4b61712a720b2f90b47fe69127a76f258e3322f8 /drivers/net/sfc/falcon.c | |
parent | sfc: Rework MAC, PHY and board event handling (diff) | |
download | linux-e6fa2eb789f49dc51a20d3db0d410bc8158abb43.tar.xz linux-e6fa2eb789f49dc51a20d3db0d410bc8158abb43.zip |
sfc: Add support for Solarflare 10Xpress SFT9001
Add type codes for the new PHY and rename the SFX7101 type code.
Add definition of clause 22 extension MMD.
Adapt the 10Xpress SFX7101 code to support the SFT9001 as well.
Clean up register definitions.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/falcon.c')
-rw-r--r-- | drivers/net/sfc/falcon.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c index 5a70ee7e8142..db8e147f00b2 100644 --- a/drivers/net/sfc/falcon.c +++ b/drivers/net/sfc/falcon.c @@ -826,7 +826,7 @@ static void falcon_handle_rx_not_ok(struct efx_rx_queue *rx_queue, #endif if (unlikely(rx_ev_eth_crc_err && EFX_WORKAROUND_10750(efx) && - efx->phy_type == PHY_TYPE_10XPRESS)) + efx->phy_type == PHY_TYPE_SFX7101)) tenxpress_crc_err(efx); } @@ -2245,8 +2245,12 @@ static void falcon_init_mdio(struct mii_if_info *gmii) static int falcon_probe_phy(struct efx_nic *efx) { switch (efx->phy_type) { - case PHY_TYPE_10XPRESS: - efx->phy_op = &falcon_tenxpress_phy_ops; + case PHY_TYPE_SFX7101: + efx->phy_op = &falcon_sfx7101_phy_ops; + break; + case PHY_TYPE_SFT9001A: + case PHY_TYPE_SFT9001B: + efx->phy_op = &falcon_sft9001_phy_ops; break; case PHY_TYPE_XFP: efx->phy_op = &falcon_xfp_phy_ops; |