From 5b73d9955fb4b0e3c37f8f6c71910293246c89dc Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Thu, 22 Mar 2018 23:31:38 +0100 Subject: [PATCH 1/2] net: phy: intel-xway: add VR9 version number The VR9 phy ids are matching only for the SoC version 1.2. Rename the macros and change the names to take this into account. Signed-off-by: Mathias Kresin Signed-off-by: David S. Miller --- drivers/net/phy/intel-xway.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) --- a/drivers/net/phy/intel-xway.c +++ b/drivers/net/phy/intel-xway.c @@ -149,8 +149,8 @@ #define PHY_ID_PHY22F_1_4 0xD565A410 #define PHY_ID_PHY11G_1_5 0xD565A401 #define PHY_ID_PHY22F_1_5 0xD565A411 -#define PHY_ID_PHY11G_VR9 0xD565A409 -#define PHY_ID_PHY22F_VR9 0xD565A419 +#define PHY_ID_PHY11G_VR9_1_2 0xD565A409 +#define PHY_ID_PHY22F_VR9_1_2 0xD565A419 #if IS_ENABLED(CONFIG_OF_MDIO) static int vr9_gphy_of_reg_init(struct phy_device *phydev) @@ -372,9 +372,9 @@ static struct phy_driver xway_gphy[] = { .suspend = genphy_suspend, .resume = genphy_resume, }, { - .phy_id = PHY_ID_PHY11G_VR9, + .phy_id = PHY_ID_PHY11G_VR9_1_2, .phy_id_mask = 0xffffffff, - .name = "Intel XWAY PHY11G (xRX integrated)", + .name = "Intel XWAY PHY11G (xRX v1.2 integrated)", .features = (PHY_GBIT_FEATURES | SUPPORTED_Pause | SUPPORTED_Asym_Pause), .flags = PHY_HAS_INTERRUPT, @@ -387,9 +387,9 @@ static struct phy_driver xway_gphy[] = { .suspend = genphy_suspend, .resume = genphy_resume, }, { - .phy_id = PHY_ID_PHY22F_VR9, + .phy_id = PHY_ID_PHY22F_VR9_1_2, .phy_id_mask = 0xffffffff, - .name = "Intel XWAY PHY22F (xRX integrated)", + .name = "Intel XWAY PHY22F (xRX v1.2 integrated)", .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause | SUPPORTED_Asym_Pause), .flags = PHY_HAS_INTERRUPT, @@ -412,8 +412,8 @@ static struct mdio_device_id __maybe_unu { PHY_ID_PHY22F_1_4, 0xffffffff }, { PHY_ID_PHY11G_1_5, 0xffffffff }, { PHY_ID_PHY22F_1_5, 0xffffffff }, - { PHY_ID_PHY11G_VR9, 0xffffffff }, - { PHY_ID_PHY22F_VR9, 0xffffffff }, + { PHY_ID_PHY11G_VR9_1_2, 0xffffffff }, + { PHY_ID_PHY22F_VR9_1_2, 0xffffffff }, { } }; MODULE_DEVICE_TABLE(mdio, xway_gphy_tbl);