forked from Openwrt-EcoNet/openwrt
91ce7f606a
f24f7b2f3af9 r8169: add support for RTL8127A 4f51e7d370a0 r8169: merge chip versions 52 and 53 (RTL8117) f372ef6ed5a6 r8169: merge chip versions 64 and 65 (RTL8125D) 4dec0702b862 r8169: merge chip versions 70 and 71 (RTL8126A) b7ed5d5a78fc r8169: use pci_prepare_to_sleep in rtl_shutdown fe733618b27a r8169: add RTL_GIGA_MAC_VER_LAST to facilitate adding support for new chip versions 2b065c098c37 r8169: refactor chip version detection 0c49baf099ba r8169: add helper rtl8125_phy_param 8c40d99e5f43 r8169: add helper rtl_csi_mod for accessing extended config space Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
66 lines
2.6 KiB
Diff
66 lines
2.6 KiB
Diff
From f372ef6ed5a6b0401c884561d4bba1843e54d46a Mon Sep 17 00:00:00 2001
|
|
From: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Date: Fri, 18 Apr 2025 11:24:30 +0200
|
|
Subject: [PATCH] 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>
|
|
---
|
|
drivers/net/ethernet/realtek/r8169.h | 1 -
|
|
drivers/net/ethernet/realtek/r8169_main.c | 4 +---
|
|
drivers/net/ethernet/realtek/r8169_phy_config.c | 1 -
|
|
3 files changed, 1 insertion(+), 5 deletions(-)
|
|
|
|
--- 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,
|
|
--- 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
|
|
[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 rtl
|
|
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);
|
|
--- 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_
|
|
[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,
|
|
};
|