generic: make all phy drivers kernel 5.0 compatible

[openwrt/staging/mkresin.git] / target / linux / generic / files / drivers / net / phy / psb6970.c

diff --git a/target/linux/generic/files/drivers/net/phy/psb6970.c b/target/linux/generic/files/drivers/net/phy/psb6970.c
index 2fcd29901330f3f959509ccb35dc122ac5660241..97fb62ace2ab575a0fa9767a33e60404117c52aa 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/psb6970.c
+++ b/target/linux/generic/files/drivers/net/phy/psb6970.c
@@ -16,6 +16,7 @@
 #include <linux/netdevice.h>
 #include <linux/switch.h>
 #include <linux/phy.h>
+#include <linux/version.h>
 
 #define PSB6970_MAX_VLANS              16
 #define PSB6970_NUM_PORTS              7
@@ -70,12 +71,16 @@ struct psb6970_priv {
 
 static u16 psb6970_mii_read(struct phy_device *phydev, int reg)
 {
-       return phydev->bus->read(phydev->bus, PHYADDR(reg));
+       struct mii_bus *bus = phydev->mdio.bus;
+
+       return bus->read(bus, PHYADDR(reg));
 }
 
 static void psb6970_mii_write(struct phy_device *phydev, int reg, u16 val)
 {
-       phydev->bus->write(phydev->bus, PHYADDR(reg), val);
+       struct mii_bus *bus = phydev->mdio.bus;
+
+       bus->write(bus, PHYADDR(reg), val);
 }
 
 static int
@@ -312,16 +317,22 @@ static int psb6970_config_init(struct phy_device *pdev)
 
        priv->phy = pdev;
 
-       if (pdev->addr == 0)
+       if (pdev->mdio.addr == 0)
                printk(KERN_INFO "%s: psb6970 switch driver attached.\n",
                       pdev->attached_dev->name);
 
-       if (pdev->addr != 0) {
+       if (pdev->mdio.addr != 0) {
                kfree(priv);
                return 0;
        }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
+       linkmode_zero(pdev->supported);
+       linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT, pdev->supported);
+       linkmode_copy(pdev->advertising, pdev->supported);
+#else
        pdev->supported = pdev->advertising = SUPPORTED_100baseT_Full;
+#endif
 
        mutex_init(&priv->reg_mutex);
        priv->read = psb6970_mii_read;
@@ -384,14 +395,14 @@ static void psb6970_remove(struct phy_device *pdev)
        if (!priv)
                return;
 
-       if (pdev->addr == 0)
+       if (pdev->mdio.addr == 0)
                unregister_switch(&priv->dev);
        kfree(priv);
 }
 
 static int psb6970_fixup(struct phy_device *dev)
 {
-       struct mii_bus *bus = dev->bus;
+       struct mii_bus *bus = dev->mdio.bus;
        u16 reg;
 
        /* look for the switch on the bus */
@@ -415,13 +426,12 @@ static struct phy_driver psb6970_driver = {
        .config_init = &psb6970_config_init,
        .config_aneg = &psb6970_config_aneg,
        .read_status = &psb6970_read_status,
-       .driver = {.owner = THIS_MODULE},
 };
 
 int __init psb6970_init(void)
 {
        phy_register_fixup_for_id(PHY_ANY_ID, psb6970_fixup);
-       return phy_driver_register(&psb6970_driver);
+       return phy_driver_register(&psb6970_driver, THIS_MODULE);
 }
 
 module_init(psb6970_init);