Merge branch 'master' of git://git.denx.de/u-boot-video

[u-boot] / drivers / net / macb.c

diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 98e8c73cabb41a5599bcddfcd6a9759720bbb47b..6de0a04410aa5e0ee976c344f06dbc5eee6676a9 100644 (file)
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -317,6 +317,30 @@ static void macb_phy_reset(struct macb_device *macb)
                       netdev->name, status);
 }
 
+#ifdef CONFIG_MACB_SEARCH_PHY
+static int macb_phy_find(struct macb_device *macb)
+{
+       int i;
+       u16 phy_id;
+
+       /* Search for PHY... */
+       for (i = 0; i < 32; i++) {
+               macb->phy_addr = i;
+               phy_id = macb_mdio_read(macb, MII_PHYSID1);
+               if (phy_id != 0xffff) {
+                       printf("%s: PHY present at %d\n", macb->netdev.name, i);
+                       return 1;
+               }
+       }
+
+       /* PHY isn't up to snuff */
+       printf("%s: PHY not found", macb->netdev.name);
+
+       return 0;
+}
+#endif /* CONFIG_MACB_SEARCH_PHY */
+
+
 static int macb_phy_init(struct macb_device *macb)
 {
        struct eth_device *netdev = &macb->netdev;
@@ -325,6 +349,13 @@ static int macb_phy_init(struct macb_device *macb)
        int media, speed, duplex;
        int i;
 
+#ifdef CONFIG_MACB_SEARCH_PHY
+       /* Auto-detect phy_addr */
+       if (!macb_phy_find(macb)) {
+               return 0;
+       }
+#endif /* CONFIG_MACB_SEARCH_PHY */
+
        /* Check if the PHY is up to snuff... */
        phy_id = macb_mdio_read(macb, MII_PHYSID1);
        if (phy_id == 0xffff) {
@@ -416,14 +447,14 @@ static int macb_init(struct eth_device *netdev, bd_t *bd)
        /* choose RMII or MII mode. This depends on the board */
 #ifdef CONFIG_RMII
 #if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
-    defined(CONFIG_AT91SAM9263)
+    defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20)
        macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN));
 #else
        macb_writel(macb, USRIO, 0);
 #endif
 #else
 #if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
-    defined(CONFIG_AT91SAM9263)
+    defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20)
        macb_writel(macb, USRIO, MACB_BIT(CLKEN));
 #else
        macb_writel(macb, USRIO, MACB_BIT(MII));