r8169: merge chip versions 64 and 65 (RTL8125D)

Handling of both chip versions is the same, only difference is
the firmware. So we can merge handling of both chip versions.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/0baad123-c679-4154-923f-fdc12783e900@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/realtek/r8169.h b/drivers/net/ethernet/realtek/r8169.h
index 3f7182dc8c9ec98c05de3a1748ae39a82ad1f01e..1878c44ece91aa9ccd36ee0596a487b30f2b1177 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169.h
+++ b/drivers/net/ethernet/realtek/r8169.h
@@ -69,7 +69,6 @@ enum mac_version {
        RTL_GIGA_MAC_VER_61,
        RTL_GIGA_MAC_VER_63,
        RTL_GIGA_MAC_VER_64,
-       RTL_GIGA_MAC_VER_65,
        RTL_GIGA_MAC_VER_66,
        RTL_GIGA_MAC_VER_70,
        RTL_GIGA_MAC_NONE,

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index f2679bca9d0c11cc345b11a6235fe6be02f4d6b9..dfd356a76e9505b33d63fab9bf69d36181975555 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -106,7 +106,7 @@ static const struct rtl_chip_info {
        { 0x7cf, 0x681, RTL_GIGA_MAC_VER_66, "RTL8125BP", FIRMWARE_8125BP_2 },
 
        /* 8125D family. */
-       { 0x7cf, 0x689, RTL_GIGA_MAC_VER_65, "RTL8125D", FIRMWARE_8125D_2 },
+       { 0x7cf, 0x689, RTL_GIGA_MAC_VER_64, "RTL8125D", FIRMWARE_8125D_2 },
        { 0x7cf, 0x688, RTL_GIGA_MAC_VER_64, "RTL8125D", FIRMWARE_8125D_1 },
 
        /* 8125B family. */
@@ -3830,7 +3830,6 @@ static void rtl_hw_config(struct rtl8169_private *tp)
                [RTL_GIGA_MAC_VER_61] = rtl_hw_start_8125a_2,
                [RTL_GIGA_MAC_VER_63] = rtl_hw_start_8125b,
                [RTL_GIGA_MAC_VER_64] = rtl_hw_start_8125d,
-               [RTL_GIGA_MAC_VER_65] = rtl_hw_start_8125d,
                [RTL_GIGA_MAC_VER_66] = rtl_hw_start_8125d,
                [RTL_GIGA_MAC_VER_70] = rtl_hw_start_8126a,
        };
@@ -3849,7 +3848,6 @@ static void rtl_hw_start_8125(struct rtl8169_private *tp)
        switch (tp->mac_version) {
        case RTL_GIGA_MAC_VER_61:
        case RTL_GIGA_MAC_VER_64:
-       case RTL_GIGA_MAC_VER_65:
        case RTL_GIGA_MAC_VER_66:
                for (i = 0xa00; i < 0xb00; i += 4)
                        RTL_W32(tp, i, 0);

diff --git a/drivers/net/ethernet/realtek/r8169_phy_config.c b/drivers/net/ethernet/realtek/r8169_phy_config.c
index 7f513086ba96c96b70ff5b071266793ebaa6b320..e3adfafa2b1b6aaa3cd38f9de29b2d39c28da631 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_phy_config.c
+++ b/drivers/net/ethernet/realtek/r8169_phy_config.c
@@ -1180,7 +1180,6 @@ void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev,
                [RTL_GIGA_MAC_VER_61] = rtl8125a_2_hw_phy_config,
                [RTL_GIGA_MAC_VER_63] = rtl8125b_hw_phy_config,
                [RTL_GIGA_MAC_VER_64] = rtl8125d_hw_phy_config,
-               [RTL_GIGA_MAC_VER_65] = rtl8125d_hw_phy_config,
                [RTL_GIGA_MAC_VER_66] = rtl8125bp_hw_phy_config,
                [RTL_GIGA_MAC_VER_70] = rtl8126a_hw_phy_config,
        };