drop net-phy-broadcom-fix-rgmii-delays-configuration-for-bcm54210e.patch from 4.14...

diff --git a/queue-4.14/net-phy-broadcom-fix-rgmii-delays-configuration-for-bcm54210e.patch b/queue-4.14/net-phy-broadcom-fix-rgmii-delays-configuration-for-bcm54210e.patch
deleted file mode 100644 (file)
index fbe30a6..0000000
--- a/queue-4.14/net-phy-broadcom-fix-rgmii-delays-configuration-for-bcm54210e.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From fea7fda7f50a6059220f83251e70709e45cc8040 Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <f.fainelli@gmail.com>
-Date: Thu, 3 Oct 2019 11:43:51 -0700
-Subject: net: phy: broadcom: Fix RGMII delays configuration for BCM54210E
-
-From: Florian Fainelli <f.fainelli@gmail.com>
-
-commit fea7fda7f50a6059220f83251e70709e45cc8040 upstream.
-
-Commit 0fc9ae107669 ("net: phy: broadcom: add support for
-BCM54210E") added support for BCM54210E but also unconditionally cleared
-the RXC to RXD skew and the TXD to TXC skew, thus only making
-PHY_INTERFACE_MODE_RGMII a possible configuration. Use
-bcm54xx_config_clock_delay() which correctly sets the registers
-depending on the 4 possible PHY interface values that exist for RGMII.
-
-Fixes: 0fc9ae107669 ("net: phy: broadcom: add support for BCM54210E")
-Reported-by: Manasa Mudireddy <manasa.mudireddy@broadcom.com>
-Reported-by: Ray Jui <ray.jui@broadcom.com>
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/net/phy/broadcom.c |   11 +++--------
- 1 file changed, 3 insertions(+), 8 deletions(-)
-
---- a/drivers/net/phy/broadcom.c
-+++ b/drivers/net/phy/broadcom.c
-@@ -30,18 +30,13 @@ MODULE_DESCRIPTION("Broadcom PHY driver"
- MODULE_AUTHOR("Maciej W. Rozycki");
- MODULE_LICENSE("GPL");
- 
-+static int bcm54xx_config_clock_delay(struct phy_device *phydev);
-+
- static int bcm54210e_config_init(struct phy_device *phydev)
- {
-       int val;
- 
--      val = bcm54xx_auxctl_read(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC);
--      val &= ~MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RGMII_SKEW_EN;
--      val |= MII_BCM54XX_AUXCTL_MISC_WREN;
--      bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC, val);
--
--      val = bcm_phy_read_shadow(phydev, BCM54810_SHD_CLK_CTL);
--      val &= ~BCM54810_SHD_CLK_CTL_GTXCLK_EN;
--      bcm_phy_write_shadow(phydev, BCM54810_SHD_CLK_CTL, val);
-+      bcm54xx_config_clock_delay(phydev);
- 
-       return 0;
- }

diff --git a/queue-4.14/series b/queue-4.14/series
index 369ef1d16a2e5ddbb88e259a187ef83215cdf1aa..30226cfda919e9985f63cd08b62dba6406c77ba9 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -2,5 +2,4 @@ xfs-sanity-check-flags-of-q_xquotarm-call.patch
 mfd-intel-lpss-add-default-i2c-device-properties-for-gemini-lake.patch
 powerpc-archrandom-fix-arch_get_random_seed_int.patch
 tipc-fix-wrong-timeout-input-for-tipc_wait_for_cond.patch
-net-phy-broadcom-fix-rgmii-delays-configuration-for-bcm54210e.patch
 mt7601u-fix-bbp-version-check-in-mt7601u_wait_bbp_ready.patch

diff --git a/queue-4.19/net-phy-broadcom-fix-rgmii-delays-configuration-for-bcm54210e.patch b/queue-4.19/net-phy-broadcom-fix-rgmii-delays-configuration-for-bcm54210e.patch
deleted file mode 100644 (file)
index 4ffb32c..0000000
--- a/queue-4.19/net-phy-broadcom-fix-rgmii-delays-configuration-for-bcm54210e.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From fea7fda7f50a6059220f83251e70709e45cc8040 Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <f.fainelli@gmail.com>
-Date: Thu, 3 Oct 2019 11:43:51 -0700
-Subject: net: phy: broadcom: Fix RGMII delays configuration for BCM54210E
-
-From: Florian Fainelli <f.fainelli@gmail.com>
-
-commit fea7fda7f50a6059220f83251e70709e45cc8040 upstream.
-
-Commit 0fc9ae107669 ("net: phy: broadcom: add support for
-BCM54210E") added support for BCM54210E but also unconditionally cleared
-the RXC to RXD skew and the TXD to TXC skew, thus only making
-PHY_INTERFACE_MODE_RGMII a possible configuration. Use
-bcm54xx_config_clock_delay() which correctly sets the registers
-depending on the 4 possible PHY interface values that exist for RGMII.
-
-Fixes: 0fc9ae107669 ("net: phy: broadcom: add support for BCM54210E")
-Reported-by: Manasa Mudireddy <manasa.mudireddy@broadcom.com>
-Reported-by: Ray Jui <ray.jui@broadcom.com>
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/net/phy/broadcom.c |   11 +++--------
- 1 file changed, 3 insertions(+), 8 deletions(-)
-
---- a/drivers/net/phy/broadcom.c
-+++ b/drivers/net/phy/broadcom.c
-@@ -30,18 +30,13 @@ MODULE_DESCRIPTION("Broadcom PHY driver"
- MODULE_AUTHOR("Maciej W. Rozycki");
- MODULE_LICENSE("GPL");
- 
-+static int bcm54xx_config_clock_delay(struct phy_device *phydev);
-+
- static int bcm54210e_config_init(struct phy_device *phydev)
- {
-       int val;
- 
--      val = bcm54xx_auxctl_read(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC);
--      val &= ~MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RGMII_SKEW_EN;
--      val |= MII_BCM54XX_AUXCTL_MISC_WREN;
--      bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC, val);
--
--      val = bcm_phy_read_shadow(phydev, BCM54810_SHD_CLK_CTL);
--      val &= ~BCM54810_SHD_CLK_CTL_GTXCLK_EN;
--      bcm_phy_write_shadow(phydev, BCM54810_SHD_CLK_CTL, val);
-+      bcm54xx_config_clock_delay(phydev);
- 
-       if (phydev->dev_flags & PHY_BRCM_EN_MASTER_MODE) {
-               val = phy_read(phydev, MII_CTRL1000);

diff --git a/queue-4.19/series b/queue-4.19/series
index 5dab6aa50c13000415be92edd45cd25c4d82ed22..b678a7efc3a7b23ad9472b1342acd883633aef5d 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -8,5 +8,4 @@ powerpc-pseries-enable-support-for-ibm-drc-info-property.patch
 powerpc-archrandom-fix-arch_get_random_seed_int.patch
 tipc-update-mon-s-self-addr-when-node-addr-generated.patch
 tipc-fix-wrong-timeout-input-for-tipc_wait_for_cond.patch
-net-phy-broadcom-fix-rgmii-delays-configuration-for-bcm54210e.patch
 mt7601u-fix-bbp-version-check-in-mt7601u_wait_bbp_ready.patch