if (ag->phy_dev) {
phy_start(ag->phy_dev);
- } else if (pdata->switch_data) {
+ } else if (pdata->mii_bus_dev && pdata->switch_data) {
ag71xx_ar7240_start(ag);
} else {
ag->link = 1;
if (ag->phy_dev)
phy_stop(ag->phy_dev);
- else if (pdata->switch_data)
+ else if (pdata->mii_bus_dev && pdata->switch_data)
ag71xx_ar7240_stop(ag);
spin_lock_irqsave(&ag->lock, flags);
static int ag71xx_phy_connect_fixed(struct ag71xx *ag)
{
- struct net_device *dev = ag->dev;
+ struct platform_device *pdev = ag->pdev;
+ struct device *dev = NULL;
struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
int ret = 0;
+ if (!pdev)
+ return -ENODEV;
+
+ dev = &pdev->dev;
+
+ if (!dev)
+ return -ENODEV;
+
+ if (!ag->phy_dev) {
+ pr_err("Missing PHY for %s", dev_name(dev));
+ return -ENODEV;
+ }
+
/* use fixed settings */
switch (pdata->speed) {
case SPEED_10:
case SPEED_1000:
break;
default:
- netdev_err(dev, "invalid speed specified\n");
+ dev_err(dev, "invalid speed specified\n");
ret = -EINVAL;
break;
}
- netdev_dbg(dev, "using fixed link parameters\n");
+ dev_dbg(dev, "using fixed link parameters\n");
ag->duplex = pdata->duplex;
ag->speed = pdata->speed;
static int ag71xx_phy_connect_multi(struct ag71xx *ag)
{
- struct net_device *dev = ag->dev;
+ struct device *dev = &ag->pdev->dev;
struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
struct phy_device *phydev = NULL;
int phy_addr;
if (!(pdata->phy_mask & (1 << phy_addr)))
continue;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,5,0)
if (ag->mii_bus->phy_map[phy_addr] == NULL)
continue;
DBG("%s: PHY found at %s, uid=%08x\n",
- dev->name,
+ dev_name(dev),
dev_name(&ag->mii_bus->phy_map[phy_addr]->dev),
ag->mii_bus->phy_map[phy_addr]->phy_id);
if (phydev == NULL)
phydev = ag->mii_bus->phy_map[phy_addr];
+#else
+ if (ag->mii_bus->mdio_map[phy_addr] == NULL)
+ continue;
+
+ DBG("%s: PHY found at %s, uid=%08x\n",
+ dev_name(dev),
+ dev_name(&ag->mii_bus->mdio_map[phy_addr]->dev),
+ ag->mii_bus->mdio_map[phy_addr]->phy_id);
+
+ if (phydev == NULL)
+ phydev = mdiobus_get_phy(ag->mii_bus, phy_addr);
+#endif
}
if (!phydev) {
- netdev_err(dev, "no PHY found with phy_mask=%08x\n",
+ dev_err(dev, "no PHY found with phy_mask=%08x\n",
pdata->phy_mask);
return -ENODEV;
}
- ag->phy_dev = phy_connect(dev, dev_name(&phydev->dev),
- &ag71xx_phy_link_adjust, 0,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,5,0)
+ ag->phy_dev = phy_connect(ag->dev, dev_name(&phydev->dev),
+#else
+ ag->phy_dev = phy_connect(ag->dev, phydev_name(phydev),
+#endif
+ &ag71xx_phy_link_adjust,
pdata->phy_if_mode);
if (IS_ERR(ag->phy_dev)) {
- netdev_err(dev, "could not connect to PHY at %s\n",
+ dev_err(dev, "could not connect to PHY at %s\n",
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,5,0)
dev_name(&phydev->dev));
+#else
+ phydev_name(phydev));
+#endif
return PTR_ERR(ag->phy_dev);
}
phydev->advertising = phydev->supported;
- netdev_info(dev, "connected to PHY at %s [uid=%08x, driver=%s]\n",
- dev_name(&phydev->dev), phydev->phy_id, phydev->drv->name);
+ dev_info(dev, "connected to PHY at %s [uid=%08x, driver=%s]\n",
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,5,0)
+ dev_name(&phydev->dev),
+#else
+ phydev_name(phydev),
+#endif
+ phydev->phy_id, phydev->drv->name);
ag->link = 0;
ag->speed = 0;
return NULL;
}
-int __devinit ag71xx_phy_connect(struct ag71xx *ag)
+int ag71xx_phy_connect(struct ag71xx *ag)
{
struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
ag->mii_bus = dev_to_mii_bus(pdata->mii_bus_dev);
if (ag->mii_bus == NULL) {
- netdev_err(ag->dev, "unable to find MII bus on device '%s'\n",
+ dev_err(&ag->pdev->dev, "unable to find MII bus on device '%s'\n",
dev_name(pdata->mii_bus_dev));
return -ENODEV;
}