ramips: 5.10: port and refresh patches, ralink drv

[openwrt/staging/rmilecki.git] / target / linux / ramips / files / drivers / net / ethernet / ralink / mdio.c

diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
index 33f973bed38b1e99cf8da5defa48d85999ff747e..dceb08b83527fcd2bb9c23a229ba342154273cc5 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
+++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
@@ -64,7 +64,11 @@ int fe_connect_phy_node(struct fe_priv *priv, struct device_node *phy_node, int
 {
        const __be32 *_phy_addr = NULL;
        struct phy_device *phydev;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
        int phy_mode;
+#else
+       phy_interface_t phy_mode = PHY_INTERFACE_MODE_NA;
+#endif
 
        _phy_addr = of_get_property(phy_node, "reg", NULL);
 
@@ -73,8 +77,13 @@ int fe_connect_phy_node(struct fe_priv *priv, struct device_node *phy_node, int
                return -EINVAL;
        }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
        phy_mode = of_get_phy_mode(phy_node);
        if (phy_mode < 0) {
+#else
+       of_get_phy_mode(phy_node, &phy_mode);
+       if (phy_mode == PHY_INTERFACE_MODE_NA) {
+#endif
                dev_err(priv->dev, "incorrect phy-mode %d\n", phy_mode);
                priv->phy->phy_node[port] = NULL;
                return -EINVAL;