net: ftgmac100: Add DM_MDIO support
authorDylan Hung <dylan_hung@aspeedtech.com>
Thu, 9 Dec 2021 02:12:24 +0000 (10:12 +0800)
committerTom Rini <trini@konsulko.com>
Tue, 18 Jan 2022 17:48:17 +0000 (12:48 -0500)
Add support for DM_MDIO to connect to PHY.  For the systems that have a
stand-alone MDIO hardware block, enable CONFIG_DM_MDIO to use driver
model for MDIO devices.

Signed-off-by: Dylan Hung <dylan_hung@aspeedtech.com>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
drivers/net/ftgmac100.c

index 0687230..b6e9526 100644 (file)
@@ -220,7 +220,11 @@ static int ftgmac100_phy_init(struct udevice *dev)
        struct phy_device *phydev;
        int ret;
 
-       phydev = phy_connect(priv->bus, priv->phy_addr, dev, priv->phy_mode);
+       if (IS_ENABLED(CONFIG_DM_MDIO))
+               phydev = dm_eth_phy_connect(dev);
+       else
+               phydev = phy_connect(priv->bus, priv->phy_addr, dev, priv->phy_mode);
+
        if (!phydev)
                return -ENODEV;
 
@@ -589,10 +593,16 @@ static int ftgmac100_probe(struct udevice *dev)
        if (ret)
                goto out;
 
-       ret = ftgmac100_mdio_init(dev);
-       if (ret) {
-               dev_err(dev, "Failed to initialize mdiobus: %d\n", ret);
-               goto out;
+       /*
+        * If DM MDIO is enabled, the MDIO bus will be initialized later in
+        * dm_eth_phy_connect
+        */
+       if (!IS_ENABLED(CONFIG_DM_MDIO)) {
+               ret = ftgmac100_mdio_init(dev);
+               if (ret) {
+                       dev_err(dev, "Failed to initialize mdiobus: %d\n", ret);
+                       goto out;
+               }
        }
 
        ret = ftgmac100_phy_init(dev);