ipq40xx: 5.4: refresh patches and config
[openwrt/staging/hauke.git] / target / linux / ipq40xx / patches-5.4 / 706-ar40xx-abort-probe-on-missig-phy.patch
1 --- a/drivers/net/phy/ar40xx.c
2 +++ b/drivers/net/phy/ar40xx.c
3 @@ -1808,8 +1808,8 @@ ar40xx_phy_probe(struct phy_device *phyd
4 if (phydev->mdio.addr == 0)
5 ar40xx_priv->phy = phydev;
6
7 - phydev->supported |= SUPPORTED_1000baseT_Full;
8 - phydev->advertising |= ADVERTISED_1000baseT_Full;
9 + phy_set_max_speed(phydev, SPEED_1000);
10 + linkmode_copy(phydev->advertising, phydev->supported);
11 return 0;
12 }
13
14 @@ -2021,6 +2021,12 @@ static int ar40xx_probe(struct platform_
15 /* register switch */
16 swdev = &priv->dev;
17
18 + if (priv->mii_bus == NULL) {
19 + dev_err(&pdev->dev, "Probe failed - Missing PHYs!\n");
20 + ret = -ENODEV;
21 + goto err_missing_phy;
22 + }
23 +
24 swdev->alias = dev_name(&priv->mii_bus->dev);
25
26 swdev->cpu_port = AR40XX_PORT_CPU;
27 @@ -2052,6 +2058,7 @@ err_unregister_switch:
28 unregister_switch(&priv->dev);
29 err_unregister_phy:
30 phy_driver_unregister(&ar40xx_phy_driver);
31 +err_missing_phy:
32 platform_set_drvdata(pdev, NULL);
33 return ret;
34 }