net: emaclite: Remove deviceid property

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

diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index e06896fea710fa8141a03f74adb8d03bbd89ef06..a8905b88f19fb958d0d5a18e6c715439c69456e1 100644 (file)
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -236,15 +236,42 @@ static int gen_is_phy_connected(int phy_addr)
 {
        u_int16_t       dummy;
 
-       return(davinci_eth_phy_read(phy_addr, PHY_PHYIDR1, &dummy));
+       return(davinci_eth_phy_read(phy_addr, MII_PHYSID1, &dummy));
 }
 
 static int gen_get_link_speed(int phy_addr)
 {
        u_int16_t       tmp;
 
-       if (davinci_eth_phy_read(phy_addr, MII_STATUS_REG, &tmp) && (tmp & 0x04))
+       if (davinci_eth_phy_read(phy_addr, MII_STATUS_REG, &tmp) &&
+                       (tmp & 0x04)) {
+#if defined(CONFIG_DRIVER_TI_EMAC_USE_RMII) && \
+               defined(CONFIG_MACH_DAVINCI_DA850_EVM)
+               davinci_eth_phy_read(phy_addr, MII_LPA, &tmp);
+
+               /* Speed doesn't matter, there is no setting for it in EMAC. */
+               if (tmp & (LPA_100FULL | LPA_10FULL)) {
+                       /* set EMAC for Full Duplex  */
+                       writel(EMAC_MACCONTROL_MIIEN_ENABLE |
+                                       EMAC_MACCONTROL_FULLDUPLEX_ENABLE,
+                                       &adap_emac->MACCONTROL);
+               } else {
+                       /*set EMAC for Half Duplex  */
+                       writel(EMAC_MACCONTROL_MIIEN_ENABLE,
+                                       &adap_emac->MACCONTROL);
+               }
+
+               if (tmp & (LPA_100FULL | LPA_100HALF))
+                       writel(readl(&adap_emac->MACCONTROL) |
+                                       EMAC_MACCONTROL_RMIISPEED_100,
+                                        &adap_emac->MACCONTROL);
+               else
+                       writel(readl(&adap_emac->MACCONTROL) &
+                                       ~EMAC_MACCONTROL_RMIISPEED_100,
+                                        &adap_emac->MACCONTROL);
+#endif
                return(1);
+       }
 
        return(0);
 }
@@ -253,19 +280,19 @@ static int gen_auto_negotiate(int phy_addr)
 {
        u_int16_t       tmp;
 
-       if (!davinci_eth_phy_read(phy_addr, PHY_BMCR, &tmp))
+       if (!davinci_eth_phy_read(phy_addr, MII_BMCR, &tmp))
                return(0);
 
        /* Restart Auto_negotiation  */
-       tmp |= PHY_BMCR_AUTON;
-       davinci_eth_phy_write(phy_addr, PHY_BMCR, tmp);
+       tmp |= BMCR_ANENABLE;
+       davinci_eth_phy_write(phy_addr, MII_BMCR, tmp);
 
        /*check AutoNegotiate complete */
        udelay (10000);
-       if (!davinci_eth_phy_read(phy_addr, PHY_BMSR, &tmp))
+       if (!davinci_eth_phy_read(phy_addr, MII_BMSR, &tmp))
                return(0);
 
-       if (!(tmp & PHY_BMSR_AUTN_COMP))
+       if (!(tmp & BMSR_ANEGCOMPLETE))
                return(0);
 
        return(gen_get_link_speed(phy_addr));
@@ -295,9 +322,10 @@ static void  __attribute__((unused)) davinci_eth_gigabit_enable(void)
                         * Check if link detected is giga-bit
                         * If Gigabit mode detected, enable gigbit in MAC
                         */
-                       writel(EMAC_MACCONTROL_GIGFORCE |
-                              EMAC_MACCONTROL_GIGABIT_ENABLE,
-                              &adap_emac->MACCONTROL);
+                       writel(readl(&adap_emac->MACCONTROL) |
+                               EMAC_MACCONTROL_GIGFORCE |
+                               EMAC_MACCONTROL_GIGABIT_ENABLE,
+                               &adap_emac->MACCONTROL);
                }
        }
 }
@@ -326,6 +354,12 @@ static int davinci_eth_open(struct eth_device *dev, bd_t *bis)
        }
 #endif
 
+#if defined(CONFIG_DRIVER_TI_EMAC_USE_RMII) && \
+       defined(CONFIG_MACH_DAVINCI_DA850_EVM)
+       adap_ewrap->c0rxen = adap_ewrap->c1rxen = adap_ewrap->c2rxen = 0;
+       adap_ewrap->c0txen = adap_ewrap->c1txen = adap_ewrap->c2txen = 0;
+       adap_ewrap->c0miscen = adap_ewrap->c1miscen = adap_ewrap->c2miscen = 0;
+#endif
        rx_desc = emac_rx_desc;
 
        writel(1, &adap_emac->TXCONTROL);
@@ -423,7 +457,7 @@ static void davinci_eth_ch_teardown(int ch)
 
        if (ch == EMAC_CH_TX) {
                /* Init TX channel teardown */
-               writel(1, &adap_emac->TXTEARDOWN);
+               writel(0, &adap_emac->TXTEARDOWN);
                do {
                        /*
                         * Wait here for Tx teardown completion interrupt to
@@ -442,7 +476,7 @@ static void davinci_eth_ch_teardown(int ch)
                writel(0, &adap_emac->TX0HDP);
        } else {
                /* Init RX channel teardown */
-               writel(1, &adap_emac->RXTEARDOWN);
+               writel(0, &adap_emac->RXTEARDOWN);
                do {
                        /*
                         * Wait here for Rx teardown completion interrupt to
@@ -480,6 +514,12 @@ static void davinci_eth_close(struct eth_device *dev)
        writel(0, &adap_ewrap->EWCTL);
 #endif
 
+#if defined(CONFIG_DRIVER_TI_EMAC_USE_RMII) && \
+       defined(CONFIG_MACH_DAVINCI_DA850_EVM)
+       adap_ewrap->c0rxen = adap_ewrap->c1rxen = adap_ewrap->c2rxen = 0;
+       adap_ewrap->c0txen = adap_ewrap->c1txen = adap_ewrap->c2txen = 0;
+       adap_ewrap->c0miscen = adap_ewrap->c1miscen = adap_ewrap->c2miscen = 0;
+#endif
        debug_emac("- emac_close\n");
 }
 
@@ -627,6 +667,7 @@ int davinci_emac_initialize(void)
                return -1;
 
        memset(dev, 0, sizeof *dev);
+       sprintf(dev->name, "DaVinci-EMAC");
 
        dev->iobase = 0;
        dev->init = davinci_eth_open;
@@ -639,6 +680,9 @@ int davinci_emac_initialize(void)
 
        davinci_eth_mdio_enable();
 
+       /* let the EMAC detect the PHYs */
+       udelay(5000);
+
        for (i = 0; i < 256; i++) {
                if (readl(&adap_mdio->ALIVE))
                        break;
@@ -655,14 +699,14 @@ int davinci_emac_initialize(void)
                return(0);
 
        /* Get PHY ID and initialize phy_ops for a detected PHY */
-       if (!davinci_eth_phy_read(active_phy_addr, PHY_PHYIDR1, &tmp)) {
+       if (!davinci_eth_phy_read(active_phy_addr, MII_PHYSID1, &tmp)) {
                active_phy_addr = 0xff;
                return(0);
        }
 
        phy_id = (tmp << 16) & 0xffff0000;
 
-       if (!davinci_eth_phy_read(active_phy_addr, PHY_PHYIDR2, &tmp)) {
+       if (!davinci_eth_phy_read(active_phy_addr, MII_PHYSID2, &tmp)) {
                active_phy_addr = 0xff;
                return(0);
        }
@@ -670,6 +714,13 @@ int davinci_emac_initialize(void)
        phy_id |= tmp & 0x0000ffff;
 
        switch (phy_id) {
+       case PHY_KSZ8873:
+               sprintf(phy.name, "KSZ8873 @ 0x%02x", active_phy_addr);
+               phy.init = ksz8873_init_phy;
+               phy.is_phy_connected = ksz8873_is_phy_connected;
+               phy.get_link_speed = ksz8873_get_link_speed;
+               phy.auto_negotiate = ksz8873_auto_negotiate;
+               break;
                case PHY_LXT972:
                        sprintf(phy.name, "LXT972 @ 0x%02x", active_phy_addr);
                        phy.init = lxt972_init_phy;
@@ -684,6 +735,13 @@ int davinci_emac_initialize(void)
                        phy.get_link_speed = dp83848_get_link_speed;
                        phy.auto_negotiate = dp83848_auto_negotiate;
                        break;
+               case PHY_ET1011C:
+                       sprintf(phy.name, "ET1011C @ 0x%02x", active_phy_addr);
+                       phy.init = gen_init_phy;
+                       phy.is_phy_connected = gen_is_phy_connected;
+                       phy.get_link_speed = et1011c_get_link_speed;
+                       phy.auto_negotiate = gen_auto_negotiate;
+                       break;
                default:
                        sprintf(phy.name, "GENERIC @ 0x%02x", active_phy_addr);
                        phy.init = gen_init_phy;
@@ -692,7 +750,7 @@ int davinci_emac_initialize(void)
                        phy.auto_negotiate = gen_auto_negotiate;
        }
 
-       printf("Ethernet PHY: %s\n", phy.name);
+       debug("Ethernet PHY: %s\n", phy.name);
 
        miiphy_register(phy.name, davinci_mii_phy_read, davinci_mii_phy_write);
        return(1);