sfc: Use model numbers for PHY type names

Some of the PHY type names are overly generic.  Change them to include
the model numbers of the PHYs they represent.

Correct the model number reference at the top of xfp_phy.c.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index 13627a64bce1948135b805e0a77294b0dc56d5f9..df844defc0a997fedf7fefa239ca4f66a608f472 100644 (file)
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -2252,7 +2252,7 @@ static int falcon_probe_phy(struct efx_nic *efx)
        case PHY_TYPE_SFT9001B:
                efx->phy_op = &falcon_sft9001_phy_ops;
                break;
-       case PHY_TYPE_XFP:
+       case PHY_TYPE_QT2022C2:
                efx->phy_op = &falcon_xfp_phy_ops;
                break;
        default:

diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h
index 17283293302a3f1e3ceb3f905fcfa0b0eae94594..7033dba87ed9a9d7e75646853b21b84661b38b72 100644 (file)
--- a/drivers/net/sfc/net_driver.h
+++ b/drivers/net/sfc/net_driver.h
@@ -453,10 +453,10 @@ enum efx_int_mode {
 
 enum phy_type {
        PHY_TYPE_NONE = 0,
-       PHY_TYPE_CX4_RTMR = 1,
-       PHY_TYPE_1G_ALASKA = 2,
+       PHY_TYPE_TXC43128 = 1,
+       PHY_TYPE_88E1111 = 2,
        PHY_TYPE_SFX7101 = 3,
-       PHY_TYPE_XFP = 4,
+       PHY_TYPE_QT2022C2 = 4,
        PHY_TYPE_PM8358 = 6,
        PHY_TYPE_SFT9001A = 8,
        PHY_TYPE_SFT9001B = 10,

diff --git a/drivers/net/sfc/xfp_phy.c b/drivers/net/sfc/xfp_phy.c
index 345ffc310dca20c72053528ed7ed7f32f533a466..2d50b6ecf5f9e92b87330dc574f12dbf3741b560 100644 (file)
--- a/drivers/net/sfc/xfp_phy.c
+++ b/drivers/net/sfc/xfp_phy.c
@@ -7,7 +7,7 @@
  * by the Free Software Foundation, incorporated herein by reference.
  */
 /*
- * Driver for XFP optical PHYs (plus some support specific to the Quake 2032)
+ * Driver for XFP optical PHYs (plus some support specific to the Quake 2022/32)
  * See www.amcc.com for details (search for qt2032)
  */