aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2017-09-16 15:16:09 -0700
committerHauke Mehrtens <hauke@hauke-m.de>2017-09-30 13:58:03 +0200
commit37e1bd27d0e8a5dbc4074aa8c8d2dde26b77fb0d (patch)
tree572cf15860afe274d7465b0d8a2db6c74f990439
parent720b0e2e2d2240b5bed33478ac4bbbf570d04560 (diff)
downloadupstream-37e1bd27d0e8a5dbc4074aa8c8d2dde26b77fb0d.tar.gz
upstream-37e1bd27d0e8a5dbc4074aa8c8d2dde26b77fb0d.tar.bz2
upstream-37e1bd27d0e8a5dbc4074aa8c8d2dde26b77fb0d.zip
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>
-rw-r--r--target/linux/generic/patches-4.4/704-phy-no-genphy-soft-reset.patch11
1 files changed, 0 insertions, 11 deletions
diff --git a/target/linux/generic/patches-4.4/704-phy-no-genphy-soft-reset.patch b/target/linux/generic/patches-4.4/704-phy-no-genphy-soft-reset.patch
deleted file mode 100644
index 7cec6d3226..0000000000
--- a/target/linux/generic/patches-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,