aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-03-06 11:23:38 +0100
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-03-06 11:23:38 +0100
commitcc4ee2eeb465c1f4404b91852e6c86a43923c55e (patch)
tree84d07be2fb63d7b3d5fa82ff086f0a38fe017a51 /target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c
parent20b6e014a61a9b40c30fab8184a9abd17f55085b (diff)
downloadupstream-cc4ee2eeb465c1f4404b91852e6c86a43923c55e.tar.gz
upstream-cc4ee2eeb465c1f4404b91852e6c86a43923c55e.tar.bz2
upstream-cc4ee2eeb465c1f4404b91852e6c86a43923c55e.zip
Revert "ramips: add support for kernel 5.10"
This reverts commit b4aad29a1d7ad77d67073c1c54b28c429c64ed9b. This was accidentally folded into a single commit. Remove it and apply it properly again. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c')
-rw-r--r--target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c11
1 files changed, 1 insertions, 10 deletions
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 7317bc30aa..f442d558e1 100644
--- 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,12 +131,7 @@ 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;
-#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 phy_mode, size, id;
int shift = 12;
u32 val, mask = 0;
u32 val_delay = 0;
@@ -166,11 +161,7 @@ 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;