arm920t/at91: add at91rm9200_devices.c

[karo-tx-uboot.git] / drivers / net / davinci_emac.c

diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index 43a3d79dc569dcf634a87f86f577cd895932070f..66c0d13c2bd9ec42ba2eab1ffca39f6349430fcd 100644 (file)
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -236,7 +236,7 @@ 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)
@@ -247,10 +247,10 @@ static int gen_get_link_speed(int phy_addr)
                        (tmp & 0x04)) {
 #if defined(CONFIG_DRIVER_TI_EMAC_USE_RMII) && \
                defined(CONFIG_MACH_DAVINCI_DA850_EVM)
-               davinci_eth_phy_read(phy_addr, PHY_ANLPAR, &tmp);
+               davinci_eth_phy_read(phy_addr, MII_LPA, &tmp);
 
                /* Speed doesn't matter, there is no setting for it in EMAC. */
-               if (tmp & (PHY_ANLPAR_TXFD | PHY_ANLPAR_10FD)) {
+               if (tmp & (LPA_100FULL | LPA_10FULL)) {
                        /* set EMAC for Full Duplex  */
                        writel(EMAC_MACCONTROL_MIIEN_ENABLE |
                                        EMAC_MACCONTROL_FULLDUPLEX_ENABLE,
@@ -261,7 +261,7 @@ static int gen_get_link_speed(int phy_addr)
                                        &adap_emac->MACCONTROL);
                }
 
-               if (tmp & (PHY_ANLPAR_TXFD | PHY_ANLPAR_TX))
+               if (tmp & (LPA_100FULL | LPA_100HALF))
                        writel(readl(&adap_emac->MACCONTROL) |
                                        EMAC_MACCONTROL_RMIISPEED_100,
                                         &adap_emac->MACCONTROL);
@@ -280,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));
@@ -322,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);
                }
        }
 }
@@ -666,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;
@@ -694,14 +696,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);
        }
@@ -723,6 +725,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;