net: sunxi_emac: Switch to new U-Boot PHY API

Use new U-Boot phy_connect() API which also supports fixed PHYs.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>

diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c
index ad9e1abd161e44e8c1b70e2b36d2f52cfb87c398..4c90d4b4981d1a726e7804929bfce041b377cca4 100644 (file)
--- a/drivers/net/sunxi_emac.c
+++ b/drivers/net/sunxi_emac.c
@@ -248,10 +248,10 @@ static int emac_mdio_write(struct mii_dev *bus, int addr, int devad, int reg,
 
 static int sunxi_emac_init_phy(struct emac_eth_dev *priv, void *dev)
 {
-       int ret, mask = 0xffffffff;
+       int ret, mask = -1;
 
 #ifdef CONFIG_PHY_ADDR
-       mask = 1 << CONFIG_PHY_ADDR;
+       mask = CONFIG_PHY_ADDR;
 #endif
 
        priv->bus = mdio_alloc();
@@ -269,11 +269,10 @@ static int sunxi_emac_init_phy(struct emac_eth_dev *priv, void *dev)
        if (ret)
                return ret;
 
-       priv->phydev = phy_find_by_mask(priv->bus, mask);
+       priv->phydev = phy_connect(priv->bus, mask, dev, PHY_INTERFACE_MODE_MII);
        if (!priv->phydev)
                return -ENODEV;
 
-       phy_connect_dev(priv->phydev, dev, PHY_INTERFACE_MODE_MII);
        phy_config(priv->phydev);
 
        return 0;