generic: drop 704-phy-no-genphy-soft-reset.patch

4.4.80+ contains 71a165f6397df07a06ce643de5c2dbae29bd3cfb, 4.9.41+ contains
6c78197e4a69c19e61dfe904fdc661b2aee8ec20 which are all backports of upstream
commit 0878fff1f42c18e448ab5b8b4f6a3eb32365b5b6 ("net: phy: Do not perform
software reset for Generic PHY").

Our local patch is no longer needed, all this patch was doing was utilizing
gen10g_soft_reset which does nothing either, so just keep the code unchanged.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

diff --git a/target/linux/generic/pending-4.4/704-phy-no-genphy-soft-reset.patch b/target/linux/generic/pending-4.4/704-phy-no-genphy-soft-reset.patch
deleted file mode 100644 (file)
index 7cec6d3..0000000
--- a/target/linux/generic/pending-4.4/704-phy-no-genphy-soft-reset.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/net/phy/phy_device.c
-+++ b/drivers/net/phy/phy_device.c
-@@ -1465,7 +1465,7 @@ static struct phy_driver genphy_driver[]
-       .phy_id         = 0xffffffff,
-       .phy_id_mask    = 0xffffffff,
-       .name           = "Generic 10G PHY",
--      .soft_reset     = gen10g_soft_reset,
-+      .soft_reset     = genphy_no_soft_reset,
-       .config_init    = gen10g_config_init,
-       .features       = 0,
-       .config_aneg    = gen10g_config_aneg,

diff --git a/target/linux/generic/pending-4.9/704-phy-no-genphy-soft-reset.patch b/target/linux/generic/pending-4.9/704-phy-no-genphy-soft-reset.patch
deleted file mode 100644 (file)
index 4fad37a..0000000
--- a/target/linux/generic/pending-4.9/704-phy-no-genphy-soft-reset.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Subject: net: phy: disable soft-reset for generic PHY devices to avoid accidentally clearing preinitialized state
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- drivers/net/phy/phy_device.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/drivers/net/phy/phy_device.c
-+++ b/drivers/net/phy/phy_device.c
-@@ -1524,11 +1524,6 @@ int genphy_config_init(struct phy_device
-       return 0;
- }
- 
--static int gen10g_soft_reset(struct phy_device *phydev)
--{
--      /* Do nothing for now */
--      return 0;
--}
- EXPORT_SYMBOL(genphy_config_init);
- 
- static int gen10g_config_init(struct phy_device *phydev)
-@@ -1811,7 +1806,7 @@ static struct phy_driver genphy_driver[]
-       .phy_id         = 0xffffffff,
-       .phy_id_mask    = 0xffffffff,
-       .name           = "Generic 10G PHY",
--      .soft_reset     = gen10g_soft_reset,
-+      .soft_reset     = genphy_no_soft_reset,
-       .config_init    = gen10g_config_init,
-       .features       = 0,
-       .config_aneg    = gen10g_config_aneg,