kernel: bump 5.15 to 5.15.140
[openwrt/staging/jow.git] / target / linux / realtek / patches-5.15 / 704-drivers-net-phy-eee-support-for-rtl838x.patch
1 From 2b88563ee5aafd9571d965b7f2093a0f58d98a31 Mon Sep 17 00:00:00 2001
2 From: John Crispin <john@phrozen.org>
3 Date: Thu, 26 Nov 2020 12:02:21 +0100
4 Subject: net: phy: EEE support for rtl838x
5
6 * rename the target to realtek
7 * add refactored DSA driver
8 * add latest gpio driver
9 * lots of arch cleanups
10 * new irq driver
11 * additional boards
12
13 Submitted-by: Bert Vermeulen <bert@biot.com>
14 Submitted-by: Birger Koblitz <mail@birger-koblitz.de>
15 Submitted-by: Sander Vanheule <sander@svanheule.net>
16 Submitted-by: Bjørn Mork <bjorn@mork.no>
17 Submitted-by: John Crispin <john@phrozen.org>
18 ---
19 drivers/net/phy/phylink. | 14 +++++++++++--
20 1 file changed, 12 insertions(+), 2 deletions(-)
21
22 --- a/drivers/net/phy/phylink.c
23 +++ b/drivers/net/phy/phylink.c
24 @@ -1991,6 +1991,11 @@ int phylink_ethtool_ksettings_set(struct
25 * the presence of a PHY, this should not be changed as that
26 * should be determined from the media side advertisement.
27 */
28 + if (pl->phydev->drv->get_port && pl->phydev->drv->set_port) {
29 + if(pl->phydev->drv->get_port(pl->phydev) != kset->base.port) {
30 + pl->phydev->drv->set_port(pl->phydev, kset->base.port);
31 + }
32 + }
33 return phy_ethtool_ksettings_set(pl->phydev, kset);
34 }
35
36 @@ -2294,8 +2299,11 @@ int phylink_ethtool_get_eee(struct phyli
37
38 ASSERT_RTNL();
39
40 - if (pl->phydev)
41 + if (pl->phydev) {
42 + if (pl->phydev->drv->get_eee)
43 + return pl->phydev->drv->get_eee(pl->phydev, eee);
44 ret = phy_ethtool_get_eee(pl->phydev, eee);
45 + }
46
47 return ret;
48 }
49 @@ -2312,8 +2320,11 @@ int phylink_ethtool_set_eee(struct phyli
50
51 ASSERT_RTNL();
52
53 - if (pl->phydev)
54 + if (pl->phydev) {
55 + if (pl->phydev->drv->set_eee)
56 + return pl->phydev->drv->set_eee(pl->phydev, eee);
57 ret = phy_ethtool_set_eee(pl->phydev, eee);
58 + }
59
60 return ret;
61 }