r8169: merge support for chip versions 10, 13, 16

These chip versions are closely related and all of them have no
chip-specific MAC/PHY initialization. Therefore merge support
for the three chip versions.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Link: https://lore.kernel.org/r/469d27e0-1d06-9b15-6c96-6098b3a52e35@gmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/realtek/r8169.h b/drivers/net/ethernet/realtek/r8169.h
index 5b188ba..55ef825 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169.h
+++ b/drivers/net/ethernet/realtek/r8169.h
@@ -24,9 +24,9 @@ enum mac_version {
        RTL_GIGA_MAC_VER_10,
        RTL_GIGA_MAC_VER_11,
        /* RTL_GIGA_MAC_VER_12 was handled the same as VER_17 */
-       RTL_GIGA_MAC_VER_13,
+       /* RTL_GIGA_MAC_VER_13 was merged with VER_10 */
        RTL_GIGA_MAC_VER_14,
-       RTL_GIGA_MAC_VER_16,
+       /* RTL_GIGA_MAC_VER_16 was merged with VER_10 */
        RTL_GIGA_MAC_VER_17,
        RTL_GIGA_MAC_VER_18,
        RTL_GIGA_MAC_VER_19,

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 5a48f66..4956629 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -100,11 +100,9 @@ static const struct {
        [RTL_GIGA_MAC_VER_07] = {"RTL8102e"                             },
        [RTL_GIGA_MAC_VER_08] = {"RTL8102e"                             },
        [RTL_GIGA_MAC_VER_09] = {"RTL8102e/RTL8103e"                    },
-       [RTL_GIGA_MAC_VER_10] = {"RTL8101e"                             },
+       [RTL_GIGA_MAC_VER_10] = {"RTL8101e/RTL8100e"                    },
        [RTL_GIGA_MAC_VER_11] = {"RTL8168b/8111b"                       },
-       [RTL_GIGA_MAC_VER_13] = {"RTL8101e/RTL8100e"                    },
        [RTL_GIGA_MAC_VER_14] = {"RTL8401"                              },
-       [RTL_GIGA_MAC_VER_16] = {"RTL8101e"                             },
        [RTL_GIGA_MAC_VER_17] = {"RTL8168b/8111b"                       },
        [RTL_GIGA_MAC_VER_18] = {"RTL8168cp/8111cp"                     },
        [RTL_GIGA_MAC_VER_19] = {"RTL8168c/8111c"                       },
@@ -2040,13 +2038,10 @@ static enum mac_version rtl8169_get_mac_version(u16 xid, bool gmii)
                { 0x7cf, 0x249, RTL_GIGA_MAC_VER_08 },
                { 0x7cf, 0x348, RTL_GIGA_MAC_VER_07 },
                { 0x7cf, 0x248, RTL_GIGA_MAC_VER_07 },
-               { 0x7cf, 0x340, RTL_GIGA_MAC_VER_13 },
                { 0x7cf, 0x240, RTL_GIGA_MAC_VER_14 },
-               { 0x7cf, 0x343, RTL_GIGA_MAC_VER_10 },
-               { 0x7cf, 0x342, RTL_GIGA_MAC_VER_16 },
                { 0x7c8, 0x348, RTL_GIGA_MAC_VER_09 },
                { 0x7c8, 0x248, RTL_GIGA_MAC_VER_09 },
-               { 0x7c8, 0x340, RTL_GIGA_MAC_VER_16 },
+               { 0x7c8, 0x340, RTL_GIGA_MAC_VER_10 },
 
                /* 8110 family. */
                { 0xfc8, 0x980, RTL_GIGA_MAC_VER_06 },
@@ -3619,9 +3614,7 @@ static void rtl_hw_config(struct rtl8169_private *tp)
                [RTL_GIGA_MAC_VER_09] = rtl_hw_start_8102e_2,
                [RTL_GIGA_MAC_VER_10] = NULL,
                [RTL_GIGA_MAC_VER_11] = rtl_hw_start_8168b,
-               [RTL_GIGA_MAC_VER_13] = NULL,
                [RTL_GIGA_MAC_VER_14] = rtl_hw_start_8401,
-               [RTL_GIGA_MAC_VER_16] = NULL,
                [RTL_GIGA_MAC_VER_17] = rtl_hw_start_8168b,
                [RTL_GIGA_MAC_VER_18] = rtl_hw_start_8168cp_1,
                [RTL_GIGA_MAC_VER_19] = rtl_hw_start_8168c_1,

diff --git a/drivers/net/ethernet/realtek/r8169_phy_config.c b/drivers/net/ethernet/realtek/r8169_phy_config.c
index 7906646..930496c 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_phy_config.c
+++ b/drivers/net/ethernet/realtek/r8169_phy_config.c
@@ -1115,9 +1115,7 @@ void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev,
                [RTL_GIGA_MAC_VER_09] = rtl8102e_hw_phy_config,
                [RTL_GIGA_MAC_VER_10] = NULL,
                [RTL_GIGA_MAC_VER_11] = rtl8168bb_hw_phy_config,
-               [RTL_GIGA_MAC_VER_13] = NULL,
                [RTL_GIGA_MAC_VER_14] = rtl8401_hw_phy_config,
-               [RTL_GIGA_MAC_VER_16] = NULL,
                [RTL_GIGA_MAC_VER_17] = rtl8168bef_hw_phy_config,
                [RTL_GIGA_MAC_VER_18] = rtl8168cp_1_hw_phy_config,
                [RTL_GIGA_MAC_VER_19] = rtl8168c_1_hw_phy_config,