From: Rafał Miłecki <rafal@milecki.pl>
Date: Thu, 4 Apr 2019 09:31:28 +0000 (+0200)
Subject: kernel: b53: add support for kernels 5.0+
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8dacd75ea8869b0616b6be1a2156dc5e8c9eac9e;p=openwrt%2Fstaging%2Faparcar.git

kernel: b53: add support for kernels 5.0+

It adjusts b53 code to upstream changes from the commit 3c1bcc8614db
("net: ethernet: Convert phydev advertize and supported from u32 to link
mode").

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---

diff --git a/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c b/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c
index 5934befc9e..6de8623612 100644
--- a/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c
+++ b/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c
@@ -294,12 +294,22 @@ static int b53_phy_probe(struct phy_device *phydev)
 	if (ret)
 		return ret;
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
+	linkmode_zero(phydev->supported);
+	if (is5325(dev) || is5365(dev))
+		linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT, phydev->supported);
+	else
+		linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, phydev->supported);
+
+	linkmode_copy(phydev->advertising, phydev->supported);
+#else
 	if (is5325(dev) || is5365(dev))
 		phydev->supported = SUPPORTED_100baseT_Full;
 	else
 		phydev->supported = SUPPORTED_1000baseT_Full;
 
 	phydev->advertising = phydev->supported;
+#endif
 
 	ret = b53_switch_register(dev);
 	if (ret) {