diff options
author | Tom Rini <trini@konsulko.com> | 2017-06-03 18:05:28 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-06-03 18:05:28 -0400 |
commit | 5cafcbab580bac6c7f44ca4a164c422b7e1ecf20 (patch) | |
tree | 40be1a1863c0cbf6bec128184076ac9857962178 /drivers/net/macb.c | |
parent | 541f538f4ca50082f77f7f34f05950d57804b1cc (diff) | |
parent | 2303bff7d55df47105740e5d635d50ef9f6856b6 (diff) | |
download | u-boot-5cafcbab580bac6c7f44ca4a164c422b7e1ecf20.zip u-boot-5cafcbab580bac6c7f44ca4a164c422b7e1ecf20.tar.gz u-boot-5cafcbab580bac6c7f44ca4a164c422b7e1ecf20.tar.bz2 |
Merge git://git.denx.de/u-boot-net
Diffstat (limited to 'drivers/net/macb.c')
-rw-r--r-- | drivers/net/macb.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index bbbdb74..f9373db 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -450,7 +450,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; @@ -471,7 +470,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,8 @@ 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_RMII) || + (macb->phy_interface == PHY_INTERFACE_MODE_RGMII)) gem_writel(macb, UR, GEM_BIT(RGMII)); else gem_writel(macb, UR, 0); |