mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
8fb15ea52a
Copy dts/files/patches/configs from 5.10 to 5.15. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com> [refresh with updated DGS-1210 dts files] Signed-off-by: Sander Vanheule <sander@svanheule.net>
62 lines
1.7 KiB
Diff
62 lines
1.7 KiB
Diff
From 2b88563ee5aafd9571d965b7f2093a0f58d98a31 Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <john@phrozen.org>
|
|
Date: Thu, 26 Nov 2020 12:02:21 +0100
|
|
Subject: net: phy: EEE support for rtl838x
|
|
|
|
* rename the target to realtek
|
|
* add refactored DSA driver
|
|
* add latest gpio driver
|
|
* lots of arch cleanups
|
|
* new irq driver
|
|
* additional boards
|
|
|
|
Submitted-by: Bert Vermeulen <bert@biot.com>
|
|
Submitted-by: Birger Koblitz <mail@birger-koblitz.de>
|
|
Submitted-by: Sander Vanheule <sander@svanheule.net>
|
|
Submitted-by: Bjørn Mork <bjorn@mork.no>
|
|
Submitted-by: John Crispin <john@phrozen.org>
|
|
---
|
|
drivers/net/phy/phylink. | 14 +++++++++++--
|
|
1 file changed, 12 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/phy/phylink.c
|
|
+++ b/drivers/net/phy/phylink.c
|
|
@@ -1449,6 +1449,11 @@ int phylink_ethtool_ksettings_set(struct
|
|
* the presence of a PHY, this should not be changed as that
|
|
* should be determined from the media side advertisement.
|
|
*/
|
|
+ if (pl->phydev->drv->get_port && pl->phydev->drv->set_port) {
|
|
+ if(pl->phydev->drv->get_port(pl->phydev) != kset->base.port) {
|
|
+ pl->phydev->drv->set_port(pl->phydev, kset->base.port);
|
|
+ }
|
|
+ }
|
|
return phy_ethtool_ksettings_set(pl->phydev, kset);
|
|
}
|
|
|
|
@@ -1750,8 +1755,11 @@ int phylink_ethtool_get_eee(struct phyli
|
|
|
|
ASSERT_RTNL();
|
|
|
|
- if (pl->phydev)
|
|
+ if (pl->phydev) {
|
|
+ if (pl->phydev->drv->get_eee)
|
|
+ return pl->phydev->drv->get_eee(pl->phydev, eee);
|
|
ret = phy_ethtool_get_eee(pl->phydev, eee);
|
|
+ }
|
|
|
|
return ret;
|
|
}
|
|
@@ -1768,8 +1776,11 @@ int phylink_ethtool_set_eee(struct phyli
|
|
|
|
ASSERT_RTNL();
|
|
|
|
- if (pl->phydev)
|
|
+ if (pl->phydev) {
|
|
+ if (pl->phydev->drv->set_eee)
|
|
+ return pl->phydev->drv->set_eee(pl->phydev, eee);
|
|
ret = phy_ethtool_set_eee(pl->phydev, eee);
|
|
+ }
|
|
|
|
return ret;
|
|
}
|