net: dc2114x: Add initialized eth_device structure

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

diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index e027894cffe317b249d9ef751e3145a7fc795c86..3f09c2b65263c324c5bc3d2cd14bd21ce45641e0 100644 (file)
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -62,7 +62,7 @@ struct fec_priv gfec = {
 /*
  * MII-interface related functions
  */
-static int fec_miiphy_read(char *dev, uint8_t phyAddr, uint8_t regAddr,
+static int fec_miiphy_read(const char *dev, uint8_t phyAddr, uint8_t regAddr,
                uint16_t *retVal)
 {
        struct eth_device *edev = eth_get_dev_by_name(dev);
@@ -119,7 +119,7 @@ static void fec_mii_setspeed(struct fec_priv *fec)
        debug("fec_init: mii_speed %#lx\n",
                        fec->eth->mii_speed);
 }
-static int fec_miiphy_write(char *dev, uint8_t phyAddr, uint8_t regAddr,
+static int fec_miiphy_write(const char *dev, uint8_t phyAddr, uint8_t regAddr,
                uint16_t data)
 {
        struct eth_device *edev = eth_get_dev_by_name(dev);
@@ -314,9 +314,9 @@ static int fec_get_hwaddr(struct eth_device *dev, unsigned char *mac)
 {
 /*
  * The MX27 can store the mac address in internal eeprom
- * This mechanism is not supported now by MX51
+ * This mechanism is not supported now by MX51 or MX25
  */
-#ifdef CONFIG_MX51
+#if defined(CONFIG_MX51) || defined(CONFIG_MX25)
        return -1;
 #else
        struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
@@ -325,7 +325,7 @@ static int fec_get_hwaddr(struct eth_device *dev, unsigned char *mac)
        for (i = 0; i < 6; i++)
                mac[6-1-i] = readl(&iim->iim_bank_area0[IIM0_MAC + i]);
 
-       return is_valid_ether_addr(mac);
+       return !is_valid_ether_addr(mac);
 #endif
 }
 
@@ -367,6 +367,34 @@ static int fec_open(struct eth_device *edev)
         */
        writel(readl(&fec->eth->ecntrl) | FEC_ECNTRL_ETHER_EN,
                &fec->eth->ecntrl);
+#ifdef CONFIG_MX25
+       udelay(100);
+       /*
+        * setup the MII gasket for RMII mode
+        */
+
+       /* disable the gasket */
+       writew(0, &fec->eth->miigsk_enr);
+
+       /* wait for the gasket to be disabled */
+       while (readw(&fec->eth->miigsk_enr) & MIIGSK_ENR_READY)
+               udelay(2);
+
+       /* configure gasket for RMII, 50 MHz, no loopback, and no echo */
+       writew(MIIGSK_CFGR_IF_MODE_RMII, &fec->eth->miigsk_cfgr);
+
+       /* re-enable the gasket */
+       writew(MIIGSK_ENR_EN, &fec->eth->miigsk_enr);
+
+       /* wait until MII gasket is ready */
+       int max_loops = 10;
+       while ((readw(&fec->eth->miigsk_enr) & MIIGSK_ENR_READY) == 0) {
+               if (--max_loops <= 0) {
+                       printf("WAIT for MII Gasket ready timed out\n");
+                       break;
+               }
+       }
+#endif
 
        miiphy_wait_aneg(edev);
        miiphy_speed(edev->name, CONFIG_FEC_MXC_PHYADDR);
@@ -386,6 +414,9 @@ static int fec_init(struct eth_device *dev, bd_t* bd)
        uint32_t base;
        struct fec_priv *fec = (struct fec_priv *)dev->priv;
 
+       /* Initialize MAC address */
+       fec_set_hwaddr(dev);
+
        /*
         * reserve memory for both buffer descriptor chains at once
         * Datasheet forces the startaddress of each chain is 16 byte
@@ -477,7 +508,6 @@ static int fec_init(struct eth_device *dev, bd_t* bd)
                miiphy_restart_aneg(dev);
 
        fec_open(dev);
-       fec_set_hwaddr(dev);
        return 0;
 }
 
@@ -513,7 +543,8 @@ static void fec_halt(struct eth_device *dev)
         * Disable the Ethernet Controller
         * Note: this will also reset the BD index counter!
         */
-       writel(readl(&fec->eth->ecntrl) & ~FEC_ECNTRL_ETHER_EN, &fec->eth->ecntrl);
+       writel(readl(&fec->eth->ecntrl) & ~FEC_ECNTRL_ETHER_EN,
+                       &fec->eth->ecntrl);
        fec->rbd_index = 0;
        fec->tbd_index = 0;
        debug("eth_halt: done\n");
@@ -684,6 +715,7 @@ static int fec_probe(bd_t *bd)
        edev->send = fec_send;
        edev->recv = fec_recv;
        edev->halt = fec_halt;
+       edev->write_hwaddr = fec_set_hwaddr;
 
        fec->eth = (struct ethernet_regs *)IMX_FEC_BASE;
        fec->bd = bd;
@@ -714,7 +746,7 @@ static int fec_probe(bd_t *bd)
        writel(0x05ee0024, &fec->eth->r_cntrl); /* FIXME 0x05ee0004 */
        fec_mii_setspeed(fec);
 
-       sprintf(edev->name, "FEC_MXC");
+       sprintf(edev->name, "FEC");
 
        miiphy_register(edev->name, fec_miiphy_read, fec_miiphy_write);
 
@@ -723,7 +755,6 @@ static int fec_probe(bd_t *bd)
        if (fec_get_hwaddr(edev, ethaddr) == 0) {
                printf("got MAC address from EEPROM: %pM\n", ethaddr);
                memcpy(edev->enetaddr, ethaddr, 6);
-               fec_set_hwaddr(edev);
        }
 
        return 0;