ramips: 5.10: port and refresh patches, ralink drv

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

diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c
index f442d558e1cb0952656e0487fb72f6cd8951fc0d..7317bc30aa7e27363db8c46dfdada2c3bfdd9af1 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c
+++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c
@@ -131,7 +131,12 @@ static void mt7620_port_init(struct fe_priv *priv, struct device_node *np)
        struct mt7620_gsw *gsw = (struct mt7620_gsw *)priv->soc->swpriv;
        const __be32 *_id = of_get_property(np, "reg", NULL);
        const __be32 *phy_addr;
-       int phy_mode, size, id;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
+       int phy_mode;
+#else
+       phy_interface_t phy_mode = PHY_INTERFACE_MODE_NA;
+#endif
+       int size, id;
        int shift = 12;
        u32 val, mask = 0;
        u32 val_delay = 0;
@@ -161,7 +166,11 @@ static void mt7620_port_init(struct fe_priv *priv, struct device_node *np)
                return;
        }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
        phy_mode = of_get_phy_mode(np);
+#else
+       of_get_phy_mode(np, &phy_mode);
+#endif
        switch (phy_mode) {
        case PHY_INTERFACE_MODE_RGMII:
                mask = 0;