realtek: phy: drop unused firmware setup for RTL8214FC

The RTL8214FC is initialized with a minimum driver sequence.
The firmware usage has been made obsolete. Drop leftovers.
These include:

- old code
- firmware file
- kernel config (to include the firmware file into the build)

Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
Link: https://github.com/openwrt/openwrt/pull/21508
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/realtek/files-6.12/drivers/net/phy/rtl83xx-phy.c b/target/linux/realtek/files-6.12/drivers/net/phy/rtl83xx-phy.c
index 1d6d04b781226d009a5b65fae3354065a52907c4..92591d0eff624779a82e578df582b833dc0f3e17 100644 (file)
--- a/target/linux/realtek/files-6.12/drivers/net/phy/rtl83xx-phy.c
+++ b/target/linux/realtek/files-6.12/drivers/net/phy/rtl83xx-phy.c
@@ -58,7 +58,6 @@ extern struct rtl83xx_soc_info soc_info;
 #define RTL821X_JOIN_OTHER             2
 
 static const struct firmware rtl838x_8380_fw;
-static const struct firmware rtl838x_8214fc_fw;
 static const struct firmware rtl838x_8218b_fw;
 
 struct rtl821x_shared_priv {
@@ -661,126 +660,6 @@ static int rtl8380_configure_rtl8214c(struct phy_device *phydev)
        return 0;
 }
 
-__maybe_unused
-static int rtl8380_configure_rtl8214fc(struct phy_device *phydev)
-{
-       u32 *rtl8380_rtl8214fc_perchip;
-       u32 *rtl8380_rtl8214fc_perport;
-       struct phy_device *patchphy;
-       struct fw_header *h;
-       u32 val;
-       int ret;
-
-       /* Read internal PHY id */
-       phy_write_paged(phydev, 0, RTL821XEXT_MEDIA_PAGE_SELECT, RTL821X_MEDIA_PAGE_COPPER);
-       phy_write_paged(phydev, 0x1f, 0x1b, 0x0002);
-       val = phy_read_paged(phydev, 0x1f, 0x1c);
-       if (val != RTL821X_CHIP_ID) {
-               phydev_err(phydev, "Expected external RTL8214FC, found PHY-ID %x\n", val);
-               return -1;
-       }
-
-       h = rtl838x_request_fw(phydev, &rtl838x_8214fc_fw, FIRMWARE_838X_8214FC_1);
-       if (!h)
-               return -1;
-
-       if (h->phy != 0x8214fc00) {
-               phydev_err(phydev, "Wrong firmware file: PHY mismatch.\n");
-               return -1;
-       }
-
-       phydev_info(phydev, "patch\n");
-
-       rtl8380_rtl8214fc_perchip = (void *)h + sizeof(struct fw_header) + h->parts[0].start;
-       rtl8380_rtl8214fc_perport = (void *)h + sizeof(struct fw_header) + h->parts[1].start;
-
-       /* detect phy version */
-       phy_write_paged(phydev, RTL838X_PAGE_RAW, 27, 0x0004);
-       val = phy_read_paged(phydev, RTL838X_PAGE_RAW, 28);
-
-       val = phy_read(phydev, 16);
-       if (val & BMCR_PDOWN) {
-               rtl8214fc_power_set(phydev, PORT_MII, true);
-               rtl8214fc_power_set(phydev, PORT_FIBRE, true);
-       } else
-               rtl8380_phy_reset(phydev);
-
-       msleep(100);
-       phy_write_paged(phydev, 0, RTL821XEXT_MEDIA_PAGE_SELECT, RTL821X_MEDIA_PAGE_COPPER);
-
-       for (int i = 0; rtl8380_rtl8214fc_perchip[i * 3] &&
-                       rtl8380_rtl8214fc_perchip[i * 3 + 1]; i++) {
-               u32 page = 0;
-
-               if (rtl8380_rtl8214fc_perchip[i * 3 + 1] == 0x1f)
-                       page = rtl8380_rtl8214fc_perchip[i * 3 + 2];
-               if (rtl8380_rtl8214fc_perchip[i * 3 + 1] == 0x13 && page == 0x260) {
-                       val = phy_read_paged(phydev, 0x260, 13);
-                       val = (val & 0x1f00) | (rtl8380_rtl8214fc_perchip[i * 3 + 2] & 0xe0ff);
-                       phy_write_paged(phydev, RTL838X_PAGE_RAW,
-                                       rtl8380_rtl8214fc_perchip[i * 3 + 1], val);
-               } else {
-                       phy_write_paged(phydev, RTL838X_PAGE_RAW,
-                                       rtl8380_rtl8214fc_perchip[i * 3 + 1],
-                                       rtl8380_rtl8214fc_perchip[i * 3 + 2]);
-               }
-       }
-
-       /* Force copper medium */
-       for (int port = 0; port < 4; port++) {
-               patchphy = get_package_phy(phydev, port);
-               phy_write_paged(patchphy, RTL838X_PAGE_RAW, RTL8XXX_PAGE_SELECT, RTL8XXX_PAGE_MAIN);
-               phy_write_paged(patchphy, RTL838X_PAGE_RAW, RTL821XEXT_MEDIA_PAGE_SELECT, RTL821X_MEDIA_PAGE_COPPER);
-       }
-
-       /* Enable PHY */
-       for (int port = 0; port < 4; port++) {
-               patchphy = get_package_phy(phydev, port);
-               phy_write_paged(patchphy, RTL838X_PAGE_RAW, RTL8XXX_PAGE_SELECT, RTL8XXX_PAGE_MAIN);
-               phy_write_paged(patchphy, RTL838X_PAGE_RAW, 0x00, 0x1140);
-       }
-       mdelay(100);
-
-       /* Disable Autosensing */
-       for (int port = 0; port < 4; port++) {
-               int i;
-
-               patchphy = get_package_phy(phydev, port);
-               for (i = 0; i < 100; i++) {
-                       val = phy_read_paged(patchphy, RTL821X_PAGE_GPHY, 0x10);
-                       if ((val & 0x7) >= 3)
-                               break;
-               }
-               if (i >= 100) {
-                       phydev_err(phydev, "Could not disable autosensing\n");
-                       return -1;
-               }
-       }
-
-       ret = rtl821x_prepare_patch(phydev, 4);
-       if (ret)
-               return ret;
-
-       /* Use Broadcast ID method for patching */
-       rtl821x_phy_setup_package_broadcast(phydev, true);
-
-       for (int i = 0; rtl8380_rtl8214fc_perport[i * 2]; i++) {
-               phy_write_paged(phydev, RTL838X_PAGE_RAW, rtl8380_rtl8214fc_perport[i * 2],
-                               rtl8380_rtl8214fc_perport[i * 2 + 1]);
-       }
-
-       /* Disable broadcast ID */
-       rtl821x_phy_setup_package_broadcast(phydev, false);
-
-       /* Auto medium selection */
-       for (int i = 0; i < 4; i++) {
-               phy_write_paged(phydev, RTL838X_PAGE_RAW, RTL8XXX_PAGE_SELECT, RTL8XXX_PAGE_MAIN);
-               phy_write_paged(phydev, RTL838X_PAGE_RAW, RTL821XEXT_MEDIA_PAGE_SELECT, RTL821X_MEDIA_PAGE_AUTO);
-       }
-
-       return 0;
-}
-
 static int rtl8214fc_sfp_insert(void *upstream, const struct sfp_eeprom_id *id)
 {
        __ETHTOOL_DECLARE_LINK_MODE_MASK(support) = { 0, };

diff --git a/target/linux/realtek/files-6.12/drivers/net/phy/rtl83xx-phy.h b/target/linux/realtek/files-6.12/drivers/net/phy/rtl83xx-phy.h
index e032d1301ad6cf7d63d866dcecccb17b4f6a96c2..7e6f62e94bbc30a941a315201994d8493342ad0c 100644 (file)
--- a/target/linux/realtek/files-6.12/drivers/net/phy/rtl83xx-phy.h
+++ b/target/linux/realtek/files-6.12/drivers/net/phy/rtl83xx-phy.h
@@ -22,8 +22,6 @@ struct __packed fw_header {
  * this has been changed, this firmware file can be dropped completely.
  */
 #define FIRMWARE_838X_8380_1                   "rtl838x_phy/rtl838x_8380.fw"
-
-#define FIRMWARE_838X_8214FC_1                 "rtl838x_phy/rtl838x_8214fc.fw"
 #define FIRMWARE_838X_8218b_1                  "rtl838x_phy/rtl838x_8218b.fw"
 
 #define PHY_ID_RTL8214C                                0x001cc942

diff --git a/target/linux/realtek/files/firmware/rtl838x_phy/rtl838x_8214fc.fw b/target/linux/realtek/files/firmware/rtl838x_phy/rtl838x_8214fc.fw
deleted file mode 100644 (file)
index 035c02d..0000000
Binary files a/target/linux/realtek/files/firmware/rtl838x_phy/rtl838x_8214fc.fw and /dev/null differ

diff --git a/target/linux/realtek/rtl838x/config-6.12 b/target/linux/realtek/rtl838x/config-6.12
index 9a309e6791ca70d522b08f7feb8770680dac0c6a..946bdf4d6adef1914ad2011ef1ab85ab9b7b8f7a 100644 (file)
--- a/target/linux/realtek/rtl838x/config-6.12
+++ b/target/linux/realtek/rtl838x/config-6.12
@@ -57,7 +57,7 @@ CONFIG_DTC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_EARLY_PRINTK_8250=y
 CONFIG_EXCLUSIVE_SYSTEM_RAM=y
-CONFIG_EXTRA_FIRMWARE="rtl838x_phy/rtl838x_8214fc.fw rtl838x_phy/rtl838x_8218b.fw rtl838x_phy/rtl838x_8380.fw"
+CONFIG_EXTRA_FIRMWARE="rtl838x_phy/rtl838x_8218b.fw rtl838x_phy/rtl838x_8380.fw"
 CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 CONFIG_FIXED_PHY=y
 CONFIG_FORCE_NR_CPUS=y