bcm27xx: remove linux 5.10 compatibility

[openwrt/staging/chunkeey.git] / target / linux / bcm27xx / patches-5.10 / 950-0371-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch

diff --git a/target/linux/bcm27xx/patches-5.10/950-0371-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch b/target/linux/bcm27xx/patches-5.10/950-0371-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch
deleted file mode 100644 (file)
index ddc18fc..0000000
--- a/target/linux/bcm27xx/patches-5.10/950-0371-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 7b0e9b30aaf78bddfcb589be0686846076f23f62 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.org>
-Date: Tue, 14 May 2019 17:00:41 +0100
-Subject: [PATCH] phy: broadcom: split out the BCM54213PE from the
- BCM54210E IDs
-
-The last nibble is a revision ID, and the 54213pe is a later rev
-than the 54210e. Running the 54210e setup code on a 54213pe results
-in a broken RGMII interface.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
----
- drivers/net/phy/broadcom.c | 16 +++++++++++++---
- include/linux/brcmphy.h    |  1 +
- 2 files changed, 14 insertions(+), 3 deletions(-)
-
---- a/drivers/net/phy/broadcom.c
-+++ b/drivers/net/phy/broadcom.c
-@@ -253,7 +253,8 @@ static void bcm54xx_adjust_rxrefclk(stru
-           BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610 &&
-           BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610M &&
-           BRCM_PHY_MODEL(phydev) != PHY_ID_BCM54810 &&
--          BRCM_PHY_MODEL(phydev) != PHY_ID_BCM54811)
-+          BRCM_PHY_MODEL(phydev) != PHY_ID_BCM54811 &&
-+          BRCM_PHY_MODEL(phydev) != PHY_ID_BCM54213PE)
-               return;
- 
-       val = bcm_phy_read_shadow(phydev, BCM54XX_SHD_SCR3);
-@@ -784,13 +785,21 @@ static struct phy_driver broadcom_driver
-       .config_intr    = bcm_phy_config_intr,
- }, {
-       .phy_id         = PHY_ID_BCM54210E,
--      .phy_id_mask    = 0xfffffff0,
-+      .phy_id_mask    = 0xffffffff,
-       .name           = "Broadcom BCM54210E",
-       /* PHY_GBIT_FEATURES */
-       .config_init    = bcm54xx_config_init,
-       .ack_interrupt  = bcm_phy_ack_intr,
-       .config_intr    = bcm_phy_config_intr,
- }, {
-+      .phy_id         = PHY_ID_BCM54213PE,
-+      .phy_id_mask    = 0xffffffff,
-+      .name           = "Broadcom BCM54213PE",
-+      /* PHY_GBIT_FEATURES */
-+      .config_init    = bcm54xx_config_init,
-+      .ack_interrupt  = bcm_phy_ack_intr,
-+      .config_intr    = bcm_phy_config_intr,
-+}, {
-       .phy_id         = PHY_ID_BCM5461,
-       .phy_id_mask    = 0xfffffff0,
-       .name           = "Broadcom BCM5461",
-@@ -946,7 +955,8 @@ module_phy_driver(broadcom_drivers);
- static struct mdio_device_id __maybe_unused broadcom_tbl[] = {
-       { PHY_ID_BCM5411, 0xfffffff0 },
-       { PHY_ID_BCM5421, 0xfffffff0 },
--      { PHY_ID_BCM54210E, 0xfffffff0 },
-+      { PHY_ID_BCM54210E, 0xffffffff },
-+      { PHY_ID_BCM54213PE, 0xffffffff },
-       { PHY_ID_BCM5461, 0xfffffff0 },
-       { PHY_ID_BCM54612E, 0xfffffff0 },
-       { PHY_ID_BCM54616S, 0xfffffff0 },
---- a/include/linux/brcmphy.h
-+++ b/include/linux/brcmphy.h
-@@ -22,6 +22,7 @@
- #define PHY_ID_BCM5411                        0x00206070
- #define PHY_ID_BCM5421                        0x002060e0
- #define PHY_ID_BCM54210E              0x600d84a0
-+#define PHY_ID_BCM54213PE             0x600d84a2
- #define PHY_ID_BCM5464                        0x002060b0
- #define PHY_ID_BCM5461                        0x002060c0
- #define PHY_ID_BCM54612E              0x03625e60