Merge branch 'master' of ../master

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

diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c
index 2b733c66e306b0d9d635bb7afe19e37c47eab2b1..060bdd73971264b25d5a2c7cdd5a6d0059baa073 100644 (file)
--- a/drivers/net/mcfmii.c
+++ b/drivers/net/mcfmii.c
@@ -175,38 +175,39 @@ int mii_discover_phy(struct eth_device *dev)
 #ifdef ET_DEBUG
                        printf("PHY type 0x%x pass %d type\n", phytype, pass);
 #endif
-                       if (phytype != 0xffff) {
-                               phyaddr = phyno;
-                               phytype <<= 16;
-                               phytype |=
-                                   mii_send(mk_mii_read(phyno, PHY_PHYIDR2));
+                       if (phytype == 0xffff)
+                               continue;
+                       phyaddr = phyno;
+                       phytype <<= 16;
+                       phytype |=
+                           mii_send(mk_mii_read(phyno, PHY_PHYIDR2));
 
 #ifdef ET_DEBUG
-                               printf("PHY @ 0x%x pass %d\n", phyno, pass);
+                       printf("PHY @ 0x%x pass %d\n", phyno, pass);
 #endif
 
-                               for (i = 0; i < (sizeof(phyinfo) / sizeof(phy_info_t)); i++) {
-                                       if (phyinfo[i].phyid == phytype) {
+                       for (i = 0; (i < (sizeof(phyinfo) / sizeof(phy_info_t)))
+                               && (phyinfo[i].phyid != 0); i++) {
+                               if (phyinfo[i].phyid == phytype) {
 #ifdef ET_DEBUG
-                                               printf("phyid %x - %s\n",
-                                                      phyinfo[i].phyid,
-                                                      phyinfo[i].strid);
+                                       printf("phyid %x - %s\n",
+                                              phyinfo[i].phyid,
+                                              phyinfo[i].strid);
 #endif
-                                               strcpy(info->phy_name, phyinfo[i].strid);
-                                               info->phyname_init = 1;
-                                               found = 1;
-                                               break;
-                                       }
+                                       strcpy(info->phy_name, phyinfo[i].strid);
+                                       info->phyname_init = 1;
+                                       found = 1;
+                                       break;
                                }
+                       }
 
-                               if (!found) {
+                       if (!found) {
 #ifdef ET_DEBUG
-                                       printf("0x%08x\n", phytype);
+                               printf("0x%08x\n", phytype);
 #endif
-                                       strcpy(info->phy_name, "unknown");
-                                       info->phyname_init = 1;
-                                       break;
-                               }
+                               strcpy(info->phy_name, "unknown");
+                               info->phyname_init = 1;
+                               break;
                        }
                }
        }
@@ -226,7 +227,8 @@ void __mii_init(void)
        volatile FEC_T *fecp;
        struct eth_device *dev;
        int miispd = 0, i = 0;
-       u16 autoneg = 0;
+       u16 status = 0;
+       u16 linkgood = 0;
 
        /* retrieve from register structure */
        dev = eth_get_dev();
@@ -250,22 +252,32 @@ void __mii_init(void)
 
        info->phy_addr = mii_discover_phy(dev);
 
-#define AUTONEGLINK            (PHY_BMSR_AUTN_COMP | PHY_BMSR_LS)
        while (i < MCFFEC_TOUT_LOOP) {
-               autoneg = 0;
-               miiphy_read(dev->name, info->phy_addr, PHY_BMSR, &autoneg);
+               status = 0;
                i++;
-
-               if ((autoneg & AUTONEGLINK) == AUTONEGLINK)
+               /* Read PHY control register */
+               miiphy_read(dev->name, info->phy_addr, PHY_BMCR, &status);
+
+               /* If phy set to autonegotiate, wait for autonegotiation done,
+                * if phy is not autonegotiating, just wait for link up.
+                */
+               if ((status & PHY_BMCR_AUTON) == PHY_BMCR_AUTON) {
+                       linkgood = (PHY_BMSR_AUTN_COMP | PHY_BMSR_LS);
+               } else {
+                       linkgood = PHY_BMSR_LS;
+               }
+               /* Read PHY status register */
+               miiphy_read(dev->name, info->phy_addr, PHY_BMSR, &status);
+               if ((status & linkgood) == linkgood)
                        break;
 
-               udelay(500);
+               udelay(1);
        }
        if (i >= MCFFEC_TOUT_LOOP) {
-               printf("Auto Negotiation not complete\n");
+               printf("Link UP timeout\n");
        }
 
-       /* adapt to the half/full speed settings */
+       /* adapt to the duplex and speed settings of the phy */
        info->dup_spd = miiphy_duplex(dev->name, info->phy_addr) << 16;
        info->dup_spd |= miiphy_speed(dev->name, info->phy_addr);
 }