diff options
Diffstat (limited to 'target/linux/generic/pending-4.9/704-phy-no-genphy-soft-reset.patch')
| -rw-r--r-- | target/linux/generic/pending-4.9/704-phy-no-genphy-soft-reset.patch | 31 |
1 files changed, 10 insertions, 21 deletions
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 index a434001e27..4fad37ab30 100644 --- 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 @@ -6,37 +6,26 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> drivers/net/phy/phy_device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c -index c37d3a27e372..069f7ee3e65c 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -1482,7 +1482,7 @@ int genphy_config_init(struct phy_device *phydev) +@@ -1524,11 +1524,6 @@ int genphy_config_init(struct phy_device return 0; } -static int gen10g_soft_reset(struct phy_device *phydev) -+static int no_soft_reset(struct phy_device *phydev) - { - /* Do nothing for now */ - return 0; -@@ -1721,7 +1721,7 @@ static struct phy_driver genphy_driver[] = { - .phy_id = 0xffffffff, - .phy_id_mask = 0xffffffff, - .name = "Generic PHY", -- .soft_reset = genphy_soft_reset, -+ .soft_reset = no_soft_reset, - .config_init = genphy_config_init, - .features = PHY_GBIT_FEATURES | SUPPORTED_MII | - SUPPORTED_AUI | SUPPORTED_FIBRE | -@@ -1735,7 +1735,7 @@ static struct phy_driver genphy_driver[] = { +-{ +- /* 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 = no_soft_reset, ++ .soft_reset = genphy_no_soft_reset, .config_init = gen10g_config_init, .features = 0, .config_aneg = gen10g_config_aneg, --- -2.11.0 - |