[U-Boot] [PATCH] net: macb: Fix GMAC not work when enable DM_ETH

[Wenyou Yang]

Always search the PHY to determine the macb->phy_addr before using
the PHY to fix "No PHY present" error.

Fix the wrong test of the GMAC's phy interface mode, it should be
PHY_INTERFACE_MODE_RGMII.

Signed-off-by: Wenyou Yang <wenyou.y...@atmel.com>
---

 drivers/net/macb.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 402e866817..fbd7b4d4cd 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -447,7 +447,6 @@ static void macb_phy_reset(struct macb_device *macb, const 
char *name)
                       name, status);
 }
 
-#ifdef CONFIG_MACB_SEARCH_PHY
 static int macb_phy_find(struct macb_device *macb, const char *name)
 {
        int i;
@@ -468,7 +467,6 @@ static int macb_phy_find(struct macb_device *macb, const 
char *name)
 
        return 0;
 }
-#endif /* CONFIG_MACB_SEARCH_PHY */
 
 #ifdef CONFIG_DM_ETH
 static int macb_phy_init(struct udevice *dev, const char *name)
@@ -488,11 +486,9 @@ static int macb_phy_init(struct macb_device *macb, const 
char *name)
        int i;
 
        arch_get_mdio_control(name);
-#ifdef CONFIG_MACB_SEARCH_PHY
        /* Auto-detect phy_addr */
        if (!macb_phy_find(macb, name))
                return 0;
-#endif /* CONFIG_MACB_SEARCH_PHY */
 
        /* Check if the PHY is up to snuff... */
        phy_id = macb_mdio_read(macb, MII_PHYSID1);
@@ -667,7 +663,7 @@ static int _macb_init(struct macb_device *macb, const char 
*name)
                 * to select interface between RMII and MII.
                 */
 #ifdef CONFIG_DM_ETH
-               if (macb->phy_interface == PHY_INTERFACE_MODE_RMII)
+               if (macb->phy_interface == PHY_INTERFACE_MODE_RGMII)
                        gem_writel(macb, UR, GEM_BIT(RGMII));
                else
                        gem_writel(macb, UR, 0);
-- 
2.11.0

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot