Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 444 insertions, 331 deletions

diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index cce32d43175f..885d8baff7d5 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -17,6 +17,8 @@
  *
  * Bug fixes and cleanup by Philippe De Muyter (phdm@macqel.be)
  * Copyright (c) 2004-2006 Macq Electronique SA.
+ *
+ * Copyright (C) 2010 Freescale Semiconductor, Inc.
  */
 
 #include <linux/module.h>
@@ -45,29 +47,42 @@
 
 #include <asm/cacheflush.h>
 
-#ifndef CONFIG_ARCH_MXC
+#ifndef CONFIG_ARM
 #include <asm/coldfire.h>
 #include <asm/mcfsim.h>
 #endif
 
 #include "fec.h"
 
-#ifdef CONFIG_ARCH_MXC
-#include <mach/hardware.h>
+#if defined(CONFIG_ARM)
 #define FEC_ALIGNMENT   0xf
 #else
 #define FEC_ALIGNMENT   0x3
 #endif
 
-/*
- * Define the fixed address of the FEC hardware.
- */
-#if defined(CONFIG_M5272)
+#define DRIVER_NAME     "fec"
+
+/* Controller is ENET-MAC */
+#define FEC_QUIRK_ENET_MAC              (1 << 0)
+/* Controller needs driver to swap frame */
+#define FEC_QUIRK_SWAP_FRAME            (1 << 1)
 
-static unsigned char    fec_mac_default[] = {
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+static struct platform_device_id fec_devtype[] = {
+        {
+                .name = DRIVER_NAME,
+                .driver_data = 0,
+        }, {
+                .name = "imx28-fec",
+                .driver_data = FEC_QUIRK_ENET_MAC | FEC_QUIRK_SWAP_FRAME,
+        },
+        { }
 };
 
+static unsigned char macaddr[ETH_ALEN];
+module_param_array(macaddr, byte, NULL, 0);
+MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address");
+
+#if defined(CONFIG_M5272)
 /*
  * Some hardware gets it MAC address out of local flash memory.
  * if this is non-zero then assume it is the address to get MAC from.
@@ -133,7 +148,7 @@ static unsigned char	fec_mac_default[] = {
  * account when setting it.
  */
 #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
-    defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARCH_MXC)
+    defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARM)
 #define OPT_FRAME_SIZE  (PKT_MAXBUF_SIZE << 16)
 #else
 #define OPT_FRAME_SIZE  0
@@ -168,7 +183,7 @@ struct fec_enet_private {
         struct bufdesc  *rx_bd_base;
         struct bufdesc  *tx_bd_base;
         /* The next free ring entry */
-        struct bufdesc  *cur_rx, *cur_tx; 
+        struct bufdesc  *cur_rx, *cur_tx;
         /* The ring entries to be free()ed */
         struct bufdesc  *dirty_tx;
 
@@ -176,29 +191,21 @@ struct fec_enet_private {
         /* hold while accessing the HW like ringbuffer for tx/rx but not MAC */
         spinlock_t hw_lock;
 
-        struct  platform_device *pdev;
+        struct  platform_device *pdev;
 
         int     opened;
 
         /* Phylib and MDIO interface */
-        struct  mii_bus *mii_bus;
-        struct  phy_device *phy_dev;
-        int     mii_timeout;
-        uint    phy_speed;
+        struct  mii_bus *mii_bus;
+        struct  phy_device *phy_dev;
+        int     mii_timeout;
+        uint    phy_speed;
         phy_interface_t phy_interface;
-        int     index;
         int     link;
         int     full_duplex;
         struct  completion mdio_done;
 };
 
-static irqreturn_t fec_enet_interrupt(int irq, void * dev_id);
-static void fec_enet_tx(struct net_device *dev);
-static void fec_enet_rx(struct net_device *dev);
-static int fec_enet_close(struct net_device *dev);
-static void fec_restart(struct net_device *dev, int duplex);
-static void fec_stop(struct net_device *dev);
-
 /* FEC MII MMFR bits definition */
 #define FEC_MMFR_ST             (1 << 30)
 #define FEC_MMFR_OP_READ        (2 << 28)
@@ -213,10 +220,23 @@ static void fec_stop(struct net_device *dev);
 /* Transmitter timeout */
 #define TX_TIMEOUT (2 * HZ)
 
+static void *swap_buffer(void *bufaddr, int len)
+{
+        int i;
+        unsigned int *buf = bufaddr;
+
+        for (i = 0; i < (len + 3) / 4; i++, buf++)
+                *buf = cpu_to_be32(*buf);
+
+        return bufaddr;
+}
+
 static netdev_tx_t
-fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
+fec_enet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
+        const struct platform_device_id *id_entry =
+                                platform_get_device_id(fep->pdev);
         struct bufdesc *bdp;
         void *bufaddr;
         unsigned short  status;
@@ -235,9 +255,9 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         if (status & BD_ENET_TX_READY) {
                 /* Ooops.  All transmit buffers are full.  Bail out.
-                 * This should not happen, since dev->tbusy should be set.
+                 * This should not happen, since ndev->tbusy should be set.
                  */
-                printk("%s: tx queue full!.\n", dev->name);
+                printk("%s: tx queue full!.\n", ndev->name);
                 spin_unlock_irqrestore(&fep->hw_lock, flags);
                 return NETDEV_TX_BUSY;
         }
@@ -257,20 +277,28 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
         if (((unsigned long) bufaddr) & FEC_ALIGNMENT) {
                 unsigned int index;
                 index = bdp - fep->tx_bd_base;
-                memcpy(fep->tx_bounce[index], (void *)skb->data, skb->len);
+                memcpy(fep->tx_bounce[index], skb->data, skb->len);
                 bufaddr = fep->tx_bounce[index];
         }
 
+        /*
+         * Some design made an incorrect assumption on endian mode of
+         * the system that it's running on. As the result, driver has to
+         * swap every frame going to and coming from the controller.
+         */
+        if (id_entry->driver_data & FEC_QUIRK_SWAP_FRAME)
+                swap_buffer(bufaddr, skb->len);
+
         /* Save skb pointer */
         fep->tx_skbuff[fep->skb_cur] = skb;
 
-        dev->stats.tx_bytes += skb->len;
+        ndev->stats.tx_bytes += skb->len;
         fep->skb_cur = (fep->skb_cur+1) & TX_RING_MOD_MASK;
 
         /* Push the data cache so the CPM does not get stale memory
          * data.
          */
-        bdp->cbd_bufaddr = dma_map_single(&dev->dev, bufaddr,
+        bdp->cbd_bufaddr = dma_map_single(&fep->pdev->dev, bufaddr,
                         FEC_ENET_TX_FRSIZE, DMA_TO_DEVICE);
 
         /* Send it on its way.  Tell FEC it's ready, interrupt when done,
@@ -291,7 +319,7 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         if (bdp == fep->dirty_tx) {
                 fep->tx_full = 1;
-                netif_stop_queue(dev);
+                netif_stop_queue(ndev);
         }
 
         fep->cur_tx = bdp;
@@ -301,62 +329,170 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
         return NETDEV_TX_OK;
 }
 
+/* This function is called to start or restart the FEC during a link
+ * change.  This only happens when switching between half and full
+ * duplex.
+ */
 static void
-fec_timeout(struct net_device *dev)
+fec_restart(struct net_device *ndev, int duplex)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
+        const struct platform_device_id *id_entry =
+                                platform_get_device_id(fep->pdev);
+        int i;
+        u32 temp_mac[2];
+        u32 rcntl = OPT_FRAME_SIZE | 0x04;
 
-        dev->stats.tx_errors++;
+        /* Whack a reset.  We should wait for this. */
+        writel(1, fep->hwp + FEC_ECNTRL);
+        udelay(10);
 
-        fec_restart(dev, fep->full_duplex);
-        netif_wake_queue(dev);
-}
+        /*
+         * enet-mac reset will reset mac address registers too,
+         * so need to reconfigure it.
+         */
+        if (id_entry->driver_data & FEC_QUIRK_ENET_MAC) {
+                memcpy(&temp_mac, ndev->dev_addr, ETH_ALEN);
+                writel(cpu_to_be32(temp_mac[0]), fep->hwp + FEC_ADDR_LOW);
+                writel(cpu_to_be32(temp_mac[1]), fep->hwp + FEC_ADDR_HIGH);
+        }
 
-static irqreturn_t
-fec_enet_interrupt(int irq, void * dev_id)
-{
-        struct  net_device *dev = dev_id;
-        struct fec_enet_private *fep = netdev_priv(dev);
-        uint    int_events;
-        irqreturn_t ret = IRQ_NONE;
+        /* Clear any outstanding interrupt. */
+        writel(0xffc00000, fep->hwp + FEC_IEVENT);
 
-        do {
-                int_events = readl(fep->hwp + FEC_IEVENT);
-                writel(int_events, fep->hwp + FEC_IEVENT);
+        /* Reset all multicast. */
+        writel(0, fep->hwp + FEC_GRP_HASH_TABLE_HIGH);
+        writel(0, fep->hwp + FEC_GRP_HASH_TABLE_LOW);
+#ifndef CONFIG_M5272
+        writel(0, fep->hwp + FEC_HASH_TABLE_HIGH);
+        writel(0, fep->hwp + FEC_HASH_TABLE_LOW);
+#endif
 
-                if (int_events & FEC_ENET_RXF) {
-                        ret = IRQ_HANDLED;
-                        fec_enet_rx(dev);
-                }
+        /* Set maximum receive buffer size. */
+        writel(PKT_MAXBLR_SIZE, fep->hwp + FEC_R_BUFF_SIZE);
 
-                /* Transmit OK, or non-fatal error. Update the buffer
-                 * descriptors. FEC handles all errors, we just discover
-                 * them as part of the transmit process.
-                 */
-                if (int_events & FEC_ENET_TXF) {
-                        ret = IRQ_HANDLED;
-                        fec_enet_tx(dev);
+        /* Set receive and transmit descriptor base. */
+        writel(fep->bd_dma, fep->hwp + FEC_R_DES_START);
+        writel((unsigned long)fep->bd_dma + sizeof(struct bufdesc) * RX_RING_SIZE,
+                        fep->hwp + FEC_X_DES_START);
+
+        fep->dirty_tx = fep->cur_tx = fep->tx_bd_base;
+        fep->cur_rx = fep->rx_bd_base;
+
+        /* Reset SKB transmit buffers. */
+        fep->skb_cur = fep->skb_dirty = 0;
+        for (i = 0; i <= TX_RING_MOD_MASK; i++) {
+                if (fep->tx_skbuff[i]) {
+                        dev_kfree_skb_any(fep->tx_skbuff[i]);
+                        fep->tx_skbuff[i] = NULL;
                 }
+        }
 
-                if (int_events & FEC_ENET_MII) {
-                        ret = IRQ_HANDLED;
-                        complete(&fep->mdio_done);
+        /* Enable MII mode */
+        if (duplex) {
+                /* FD enable */
+                writel(0x04, fep->hwp + FEC_X_CNTRL);
+        } else {
+                /* No Rcv on Xmit */
+                rcntl |= 0x02;
+                writel(0x0, fep->hwp + FEC_X_CNTRL);
+        }
+
+        fep->full_duplex = duplex;
+
+        /* Set MII speed */
+        writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);
+
+        /*
+         * The phy interface and speed need to get configured
+         * differently on enet-mac.
+         */
+        if (id_entry->driver_data & FEC_QUIRK_ENET_MAC) {
+                /* Enable flow control and length check */
+                rcntl |= 0x40000000 | 0x00000020;
+
+                /* MII or RMII */
+                if (fep->phy_interface == PHY_INTERFACE_MODE_RMII)
+                        rcntl |= (1 << 8);
+                else
+                        rcntl &= ~(1 << 8);
+
+                /* 10M or 100M */
+                if (fep->phy_dev && fep->phy_dev->speed == SPEED_100)
+                        rcntl &= ~(1 << 9);
+                else
+                        rcntl |= (1 << 9);
+
+        } else {
+#ifdef FEC_MIIGSK_ENR
+                if (fep->phy_interface == PHY_INTERFACE_MODE_RMII) {
+                        /* disable the gasket and wait */
+                        writel(0, fep->hwp + FEC_MIIGSK_ENR);
+                        while (readl(fep->hwp + FEC_MIIGSK_ENR) & 4)
+                                udelay(1);
+
+                        /*
+                         * configure the gasket:
+                         *   RMII, 50 MHz, no loopback, no echo
+                         */
+                        writel(1, fep->hwp + FEC_MIIGSK_CFGR);
+
+                        /* re-enable the gasket */
+                        writel(2, fep->hwp + FEC_MIIGSK_ENR);
                 }
-        } while (int_events);
+#endif
+        }
+        writel(rcntl, fep->hwp + FEC_R_CNTRL);
 
-        return ret;
+        /* And last, enable the transmit and receive processing */
+        writel(2, fep->hwp + FEC_ECNTRL);
+        writel(0, fep->hwp + FEC_R_DES_ACTIVE);
+
+        /* Enable interrupts we wish to service */
+        writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK);
 }
 
+static void
+fec_stop(struct net_device *ndev)
+{
+        struct fec_enet_private *fep = netdev_priv(ndev);
+
+        /* We cannot expect a graceful transmit stop without link !!! */
+        if (fep->link) {
+                writel(1, fep->hwp + FEC_X_CNTRL); /* Graceful transmit stop */
+                udelay(10);
+                if (!(readl(fep->hwp + FEC_IEVENT) & FEC_ENET_GRA))
+                        printk("fec_stop : Graceful transmit stop did not complete !\n");
+        }
+
+        /* Whack a reset.  We should wait for this. */
+        writel(1, fep->hwp + FEC_ECNTRL);
+        udelay(10);
+        writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);
+        writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK);
+}
+
+
+static void
+fec_timeout(struct net_device *ndev)
+{
+        struct fec_enet_private *fep = netdev_priv(ndev);
+
+        ndev->stats.tx_errors++;
+
+        fec_restart(ndev, fep->full_duplex);
+        netif_wake_queue(ndev);
+}
 
 static void
-fec_enet_tx(struct net_device *dev)
+fec_enet_tx(struct net_device *ndev)
 {
         struct  fec_enet_private *fep;
         struct bufdesc *bdp;
         unsigned short status;
         struct  sk_buff *skb;
 
-        fep = netdev_priv(dev);
+        fep = netdev_priv(ndev);
         spin_lock(&fep->hw_lock);
         bdp = fep->dirty_tx;
 
@@ -364,7 +500,8 @@ fec_enet_tx(struct net_device *dev)
                 if (bdp == fep->cur_tx && fep->tx_full == 0)
                         break;
 
-                dma_unmap_single(&dev->dev, bdp->cbd_bufaddr, FEC_ENET_TX_FRSIZE, DMA_TO_DEVICE);
+                dma_unmap_single(&fep->pdev->dev, bdp->cbd_bufaddr,
+                                FEC_ENET_TX_FRSIZE, DMA_TO_DEVICE);
                 bdp->cbd_bufaddr = 0;
 
                 skb = fep->tx_skbuff[fep->skb_dirty];
@@ -372,19 +509,19 @@ fec_enet_tx(struct net_device *dev)
                 if (status & (BD_ENET_TX_HB | BD_ENET_TX_LC |
                                    BD_ENET_TX_RL | BD_ENET_TX_UN |
                                    BD_ENET_TX_CSL)) {
-                        dev->stats.tx_errors++;
+                        ndev->stats.tx_errors++;
                         if (status & BD_ENET_TX_HB)  /* No heartbeat */
-                                dev->stats.tx_heartbeat_errors++;
+                                ndev->stats.tx_heartbeat_errors++;
                         if (status & BD_ENET_TX_LC)  /* Late collision */
-                                dev->stats.tx_window_errors++;
+                                ndev->stats.tx_window_errors++;
                         if (status & BD_ENET_TX_RL)  /* Retrans limit */
-                                dev->stats.tx_aborted_errors++;
+                                ndev->stats.tx_aborted_errors++;
                         if (status & BD_ENET_TX_UN)  /* Underrun */
-                                dev->stats.tx_fifo_errors++;
+                                ndev->stats.tx_fifo_errors++;
                         if (status & BD_ENET_TX_CSL) /* Carrier lost */
-                                dev->stats.tx_carrier_errors++;
+                                ndev->stats.tx_carrier_errors++;
                 } else {
-                        dev->stats.tx_packets++;
+                        ndev->stats.tx_packets++;
                 }
 
                 if (status & BD_ENET_TX_READY)
@@ -394,7 +531,7 @@ fec_enet_tx(struct net_device *dev)
                  * but we eventually sent the packet OK.
                  */
                 if (status & BD_ENET_TX_DEF)
-                        dev->stats.collisions++;
+                        ndev->stats.collisions++;
 
                 /* Free the sk buffer associated with this last transmit */
                 dev_kfree_skb_any(skb);
@@ -411,8 +548,8 @@ fec_enet_tx(struct net_device *dev)
                  */
                 if (fep->tx_full) {
                         fep->tx_full = 0;
-                        if (netif_queue_stopped(dev))
-                                netif_wake_queue(dev);
+                        if (netif_queue_stopped(ndev))
+                                netif_wake_queue(ndev);
                 }
         }
         fep->dirty_tx = bdp;
@@ -426,9 +563,11 @@ fec_enet_tx(struct net_device *dev)
  * effectively tossing the packet.
  */
 static void
-fec_enet_rx(struct net_device *dev)
+fec_enet_rx(struct net_device *ndev)
 {
-        struct  fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
+        const struct platform_device_id *id_entry =
+                                platform_get_device_id(fep->pdev);
         struct bufdesc *bdp;
         unsigned short status;
         struct  sk_buff *skb;
@@ -460,17 +599,17 @@ fec_enet_rx(struct net_device *dev)
                 /* Check for errors. */
                 if (status & (BD_ENET_RX_LG | BD_ENET_RX_SH | BD_ENET_RX_NO |
                            BD_ENET_RX_CR | BD_ENET_RX_OV)) {
-                        dev->stats.rx_errors++;
+                        ndev->stats.rx_errors++;
                         if (status & (BD_ENET_RX_LG | BD_ENET_RX_SH)) {
                                 /* Frame too long or too short. */
-                                dev->stats.rx_length_errors++;
+                                ndev->stats.rx_length_errors++;
                         }
                         if (status & BD_ENET_RX_NO)     /* Frame alignment */
-                                dev->stats.rx_frame_errors++;
+                                ndev->stats.rx_frame_errors++;
                         if (status & BD_ENET_RX_CR)     /* CRC Error */
-                                dev->stats.rx_crc_errors++;
+                                ndev->stats.rx_crc_errors++;
                         if (status & BD_ENET_RX_OV)     /* FIFO overrun */
-                                dev->stats.rx_fifo_errors++;
+                                ndev->stats.rx_fifo_errors++;
                 }
 
                 /* Report late collisions as a frame error.
@@ -478,19 +617,22 @@ fec_enet_rx(struct net_device *dev)
                  * have in the buffer.  So, just drop this frame on the floor.
                  */
                 if (status & BD_ENET_RX_CL) {
-                        dev->stats.rx_errors++;
-                        dev->stats.rx_frame_errors++;
+                        ndev->stats.rx_errors++;
+                        ndev->stats.rx_frame_errors++;
                         goto rx_processing_done;
                 }
 
                 /* Process the incoming frame. */
-                dev->stats.rx_packets++;
+                ndev->stats.rx_packets++;
                 pkt_len = bdp->cbd_datlen;
-                dev->stats.rx_bytes += pkt_len;
+                ndev->stats.rx_bytes += pkt_len;
                 data = (__u8*)__va(bdp->cbd_bufaddr);
 
-                dma_unmap_single(NULL, bdp->cbd_bufaddr, bdp->cbd_datlen,
-                                DMA_FROM_DEVICE);
+                dma_unmap_single(&fep->pdev->dev, bdp->cbd_bufaddr,
+                                FEC_ENET_TX_FRSIZE, DMA_FROM_DEVICE);
+
+                if (id_entry->driver_data & FEC_QUIRK_SWAP_FRAME)
+                        swap_buffer(data, pkt_len);
 
                 /* This does 16 byte alignment, exactly what we need.
                  * The packet length includes FCS, but we don't want to
@@ -501,18 +643,18 @@ fec_enet_rx(struct net_device *dev)
 
                 if (unlikely(!skb)) {
                         printk("%s: Memory squeeze, dropping packet.\n",
-                                        dev->name);
-                        dev->stats.rx_dropped++;
+                                        ndev->name);
+                        ndev->stats.rx_dropped++;
                 } else {
                         skb_reserve(skb, NET_IP_ALIGN);
                         skb_put(skb, pkt_len - 4);      /* Make room */
                         skb_copy_to_linear_data(skb, data, pkt_len - 4);
-                        skb->protocol = eth_type_trans(skb, dev);
+                        skb->protocol = eth_type_trans(skb, ndev);
                         netif_rx(skb);
                 }
 
-                bdp->cbd_bufaddr = dma_map_single(NULL, data, bdp->cbd_datlen,
-                        DMA_FROM_DEVICE);
+                bdp->cbd_bufaddr = dma_map_single(&fep->pdev->dev, data,
+                                FEC_ENET_TX_FRSIZE, DMA_FROM_DEVICE);
 rx_processing_done:
                 /* Clear the status flags for this buffer */
                 status &= ~BD_ENET_RX_STATS;
@@ -537,47 +679,97 @@ rx_processing_done:
         spin_unlock(&fep->hw_lock);
 }
 
+static irqreturn_t
+fec_enet_interrupt(int irq, void *dev_id)
+{
+        struct net_device *ndev = dev_id;
+        struct fec_enet_private *fep = netdev_priv(ndev);
+        uint int_events;
+        irqreturn_t ret = IRQ_NONE;
+
+        do {
+                int_events = readl(fep->hwp + FEC_IEVENT);
+                writel(int_events, fep->hwp + FEC_IEVENT);
+
+                if (int_events & FEC_ENET_RXF) {
+                        ret = IRQ_HANDLED;
+                        fec_enet_rx(ndev);
+                }
+
+                /* Transmit OK, or non-fatal error. Update the buffer
+                 * descriptors. FEC handles all errors, we just discover
+                 * them as part of the transmit process.
+                 */
+                if (int_events & FEC_ENET_TXF) {
+                        ret = IRQ_HANDLED;
+                        fec_enet_tx(ndev);
+                }
+
+                if (int_events & FEC_ENET_MII) {
+                        ret = IRQ_HANDLED;
+                        complete(&fep->mdio_done);
+                }
+        } while (int_events);
+
+        return ret;
+}
+
+
+
 /* ------------------------------------------------------------------------- */
-#ifdef CONFIG_M5272
-static void __inline__ fec_get_mac(struct net_device *dev)
+static void __inline__ fec_get_mac(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
+        struct fec_platform_data *pdata = fep->pdev->dev.platform_data;
         unsigned char *iap, tmpaddr[ETH_ALEN];
 
-        if (FEC_FLASHMAC) {
-                /*
-                 * Get MAC address from FLASH.
-                 * If it is all 1's or 0's, use the default.
-                 */
-                iap = (unsigned char *)FEC_FLASHMAC;
-                if ((iap[0] == 0) && (iap[1] == 0) && (iap[2] == 0) &&
-                    (iap[3] == 0) && (iap[4] == 0) && (iap[5] == 0))
-                        iap = fec_mac_default;
-                if ((iap[0] == 0xff) && (iap[1] == 0xff) && (iap[2] == 0xff) &&
-                    (iap[3] == 0xff) && (iap[4] == 0xff) && (iap[5] == 0xff))
-                        iap = fec_mac_default;
-        } else {
-                *((unsigned long *) &tmpaddr[0]) = readl(fep->hwp + FEC_ADDR_LOW);
-                *((unsigned short *) &tmpaddr[4]) = (readl(fep->hwp + FEC_ADDR_HIGH) >> 16);
+        /*
+         * try to get mac address in following order:
+         *
+         * 1) module parameter via kernel command line in form
+         *    fec.macaddr=0x00,0x04,0x9f,0x01,0x30,0xe0
+         */
+        iap = macaddr;
+
+        /*
+         * 2) from flash or fuse (via platform data)
+         */
+        if (!is_valid_ether_addr(iap)) {
+#ifdef CONFIG_M5272
+                if (FEC_FLASHMAC)
+                        iap = (unsigned char *)FEC_FLASHMAC;
+#else
+                if (pdata)
+                        memcpy(iap, pdata->mac, ETH_ALEN);
+#endif
+        }
+
+        /*
+         * 3) FEC mac registers set by bootloader
+         */
+        if (!is_valid_ether_addr(iap)) {
+                *((unsigned long *) &tmpaddr[0]) =
+                        be32_to_cpu(readl(fep->hwp + FEC_ADDR_LOW));
+                *((unsigned short *) &tmpaddr[4]) =
+                        be16_to_cpu(readl(fep->hwp + FEC_ADDR_HIGH) >> 16);
                 iap = &tmpaddr[0];
         }
 
-        memcpy(dev->dev_addr, iap, ETH_ALEN);
+        memcpy(ndev->dev_addr, iap, ETH_ALEN);
 
-        /* Adjust MAC if using default MAC address */
-        if (iap == fec_mac_default)
-                 dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->index;
+        /* Adjust MAC if using macaddr */
+        if (iap == macaddr)
+                 ndev->dev_addr[ETH_ALEN-1] = macaddr[ETH_ALEN-1] + fep->pdev->id;
 }
-#endif
 
 /* ------------------------------------------------------------------------- */
 
 /*
  * Phy section
  */
-static void fec_enet_adjust_link(struct net_device *dev)
+static void fec_enet_adjust_link(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         struct phy_device *phy_dev = fep->phy_dev;
         unsigned long flags;
 
@@ -594,7 +786,7 @@ static void fec_enet_adjust_link(struct net_device *dev)
         /* Duplex link change */
         if (phy_dev->link) {
                 if (fep->full_duplex != phy_dev->duplex) {
-                        fec_restart(dev, phy_dev->duplex);
+                        fec_restart(ndev, phy_dev->duplex);
                         status_change = 1;
                 }
         }
@@ -603,9 +795,9 @@ static void fec_enet_adjust_link(struct net_device *dev)
         if (phy_dev->link != fep->link) {
                 fep->link = phy_dev->link;
                 if (phy_dev->link)
-                        fec_restart(dev, phy_dev->duplex);
+                        fec_restart(ndev, phy_dev->duplex);
                 else
-                        fec_stop(dev);
+                        fec_stop(ndev);
                 status_change = 1;
         }
 
@@ -651,8 +843,8 @@ static int fec_enet_mdio_write(struct mii_bus *bus, int mii_id, int regnum,
         fep->mii_timeout = 0;
         init_completion(&fep->mdio_done);
 
-        /* start a read op */
-        writel(FEC_MMFR_ST | FEC_MMFR_OP_READ |
+        /* start a write op */
+        writel(FEC_MMFR_ST | FEC_MMFR_OP_WRITE |
                 FEC_MMFR_PA(mii_id) | FEC_MMFR_RA(regnum) |
                 FEC_MMFR_TA | FEC_MMFR_DATA(value),
                 fep->hwp + FEC_MII_DATA);
@@ -674,13 +866,14 @@ static int fec_enet_mdio_reset(struct mii_bus *bus)
         return 0;
 }
 
-static int fec_enet_mii_probe(struct net_device *dev)
+static int fec_enet_mii_probe(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         struct phy_device *phy_dev = NULL;
         char mdio_bus_id[MII_BUS_ID_SIZE];
         char phy_name[MII_BUS_ID_SIZE + 3];
         int phy_id;
+        int dev_id = fep->pdev->id;
 
         fep->phy_dev = NULL;
 
@@ -692,22 +885,24 @@ static int fec_enet_mii_probe(struct net_device *dev)
                         continue;
                 if (fep->mii_bus->phy_map[phy_id]->phy_id == 0)
                         continue;
+                if (dev_id--)
+                        continue;
                 strncpy(mdio_bus_id, fep->mii_bus->id, MII_BUS_ID_SIZE);
                 break;
         }
 
         if (phy_id >= PHY_MAX_ADDR) {
                 printk(KERN_INFO "%s: no PHY, assuming direct connection "
-                        "to switch\n", dev->name);
+                        "to switch\n", ndev->name);
                 strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE);
                 phy_id = 0;
         }
 
         snprintf(phy_name, MII_BUS_ID_SIZE, PHY_ID_FMT, mdio_bus_id, phy_id);
-        phy_dev = phy_connect(dev, phy_name, &fec_enet_adjust_link, 0,
+        phy_dev = phy_connect(ndev, phy_name, &fec_enet_adjust_link, 0,
                 PHY_INTERFACE_MODE_MII);
         if (IS_ERR(phy_dev)) {
-                printk(KERN_ERR "%s: could not attach to PHY\n", dev->name);
+                printk(KERN_ERR "%s: could not attach to PHY\n", ndev->name);
                 return PTR_ERR(phy_dev);
         }
 
@@ -720,7 +915,7 @@ static int fec_enet_mii_probe(struct net_device *dev)
         fep->full_duplex = 0;
 
         printk(KERN_INFO "%s: Freescale FEC PHY driver [%s] "
-                "(mii_bus:phy_addr=%s, irq=%d)\n", dev->name,
+                "(mii_bus:phy_addr=%s, irq=%d)\n", ndev->name,
                 fep->phy_dev->drv->name, dev_name(&fep->phy_dev->dev),
                 fep->phy_dev->irq);
 
@@ -729,10 +924,35 @@ static int fec_enet_mii_probe(struct net_device *dev)
 
 static int fec_enet_mii_init(struct platform_device *pdev)
 {
-        struct net_device *dev = platform_get_drvdata(pdev);
-        struct fec_enet_private *fep = netdev_priv(dev);
+        static struct mii_bus *fec0_mii_bus;
+        struct net_device *ndev = platform_get_drvdata(pdev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
+        const struct platform_device_id *id_entry =
+                                platform_get_device_id(fep->pdev);
         int err = -ENXIO, i;
 
+        /*
+         * The dual fec interfaces are not equivalent with enet-mac.
+         * Here are the differences:
+         *
+         *  - fec0 supports MII & RMII modes while fec1 only supports RMII
+         *  - fec0 acts as the 1588 time master while fec1 is slave
+         *  - external phys can only be configured by fec0
+         *
+         * That is to say fec1 can not work independently. It only works
+         * when fec0 is working. The reason behind this design is that the
+         * second interface is added primarily for Switch mode.
+         *
+         * Because of the last point above, both phys are attached on fec0
+         * mdio interface in board design, and need to be configured by
+         * fec0 mii_bus.
+         */
+        if ((id_entry->driver_data & FEC_QUIRK_ENET_MAC) && pdev->id) {
+                /* fec1 uses fec0 mii_bus */
+                fep->mii_bus = fec0_mii_bus;
+                return 0;
+        }
+
         fep->mii_timeout = 0;
 
         /*
@@ -764,11 +984,13 @@ static int fec_enet_mii_init(struct platform_device *pdev)
         for (i = 0; i < PHY_MAX_ADDR; i++)
                 fep->mii_bus->irq[i] = PHY_POLL;
 
-        platform_set_drvdata(dev, fep->mii_bus);
-
         if (mdiobus_register(fep->mii_bus))
                 goto err_out_free_mdio_irq;
 
+        /* save fec0 mii_bus */
+        if (id_entry->driver_data & FEC_QUIRK_ENET_MAC)
+                fec0_mii_bus = fep->mii_bus;
+
         return 0;
 
 err_out_free_mdio_irq:
@@ -788,10 +1010,10 @@ static void fec_enet_mii_remove(struct fec_enet_private *fep)
         mdiobus_free(fep->mii_bus);
 }
 
-static int fec_enet_get_settings(struct net_device *dev,
+static int fec_enet_get_settings(struct net_device *ndev,
                                   struct ethtool_cmd *cmd)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         struct phy_device *phydev = fep->phy_dev;
 
         if (!phydev)
@@ -800,10 +1022,10 @@ static int fec_enet_get_settings(struct net_device *dev,
         return phy_ethtool_gset(phydev, cmd);
 }
 
-static int fec_enet_set_settings(struct net_device *dev,
+static int fec_enet_set_settings(struct net_device *ndev,
                                  struct ethtool_cmd *cmd)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         struct phy_device *phydev = fep->phy_dev;
 
         if (!phydev)
@@ -812,14 +1034,14 @@ static int fec_enet_set_settings(struct net_device *dev,
         return phy_ethtool_sset(phydev, cmd);
 }
 
-static void fec_enet_get_drvinfo(struct net_device *dev,
+static void fec_enet_get_drvinfo(struct net_device *ndev,
                                  struct ethtool_drvinfo *info)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
 
         strcpy(info->driver, fep->pdev->dev.driver->name);
         strcpy(info->version, "Revision: 1.0");
-        strcpy(info->bus_info, dev_name(&dev->dev));
+        strcpy(info->bus_info, dev_name(&ndev->dev));
 }
 
 static struct ethtool_ops fec_enet_ethtool_ops = {
@@ -829,12 +1051,12 @@ static struct ethtool_ops fec_enet_ethtool_ops = {
         .get_link               = ethtool_op_get_link,
 };
 
-static int fec_enet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+static int fec_enet_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         struct phy_device *phydev = fep->phy_dev;
 
-        if (!netif_running(dev))
+        if (!netif_running(ndev))
                 return -EINVAL;
 
         if (!phydev)
@@ -843,9 +1065,9 @@ static int fec_enet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         return phy_mii_ioctl(phydev, rq, cmd);
 }
 
-static void fec_enet_free_buffers(struct net_device *dev)
+static void fec_enet_free_buffers(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         int i;
         struct sk_buff *skb;
         struct bufdesc  *bdp;
@@ -855,7 +1077,7 @@ static void fec_enet_free_buffers(struct net_device *dev)
                 skb = fep->rx_skbuff[i];
 
                 if (bdp->cbd_bufaddr)
-                        dma_unmap_single(&dev->dev, bdp->cbd_bufaddr,
+                        dma_unmap_single(&fep->pdev->dev, bdp->cbd_bufaddr,
                                         FEC_ENET_RX_FRSIZE, DMA_FROM_DEVICE);
                 if (skb)
                         dev_kfree_skb(skb);
@@ -867,9 +1089,9 @@ static void fec_enet_free_buffers(struct net_device *dev)
                 kfree(fep->tx_bounce[i]);
 }
 
-static int fec_enet_alloc_buffers(struct net_device *dev)
+static int fec_enet_alloc_buffers(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         int i;
         struct sk_buff *skb;
         struct bufdesc  *bdp;
@@ -878,12 +1100,12 @@ static int fec_enet_alloc_buffers(struct net_device *dev)
         for (i = 0; i < RX_RING_SIZE; i++) {
                 skb = dev_alloc_skb(FEC_ENET_RX_FRSIZE);
                 if (!skb) {
-                        fec_enet_free_buffers(dev);
+                        fec_enet_free_buffers(ndev);
                         return -ENOMEM;
                 }
                 fep->rx_skbuff[i] = skb;
 
-                bdp->cbd_bufaddr = dma_map_single(&dev->dev, skb->data,
+                bdp->cbd_bufaddr = dma_map_single(&fep->pdev->dev, skb->data,
                                 FEC_ENET_RX_FRSIZE, DMA_FROM_DEVICE);
                 bdp->cbd_sc = BD_ENET_RX_EMPTY;
                 bdp++;
@@ -910,45 +1132,47 @@ static int fec_enet_alloc_buffers(struct net_device *dev)
 }
 
 static int
-fec_enet_open(struct net_device *dev)
+fec_enet_open(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         int ret;
 
         /* I should reset the ring buffers here, but I don't yet know
          * a simple way to do that.
          */
 
-        ret = fec_enet_alloc_buffers(dev);
+        ret = fec_enet_alloc_buffers(ndev);
         if (ret)
                 return ret;
 
         /* Probe and connect to PHY when open the interface */
-        ret = fec_enet_mii_probe(dev);
+        ret = fec_enet_mii_probe(ndev);
         if (ret) {
-                fec_enet_free_buffers(dev);
+                fec_enet_free_buffers(ndev);
                 return ret;
         }
         phy_start(fep->phy_dev);
-        netif_start_queue(dev);
+        netif_start_queue(ndev);
         fep->opened = 1;
         return 0;
 }
 
 static int
-fec_enet_close(struct net_device *dev)
+fec_enet_close(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
 
         /* Don't know what to do yet. */
         fep->opened = 0;
-        netif_stop_queue(dev);
-        fec_stop(dev);
+        netif_stop_queue(ndev);
+        fec_stop(ndev);
 
-        if (fep->phy_dev)
+        if (fep->phy_dev) {
+                phy_stop(fep->phy_dev);
                 phy_disconnect(fep->phy_dev);
+        }
 
-        fec_enet_free_buffers(dev);
+        fec_enet_free_buffers(ndev);
 
         return 0;
 }
@@ -966,14 +1190,14 @@ fec_enet_close(struct net_device *dev)
 #define HASH_BITS       6               /* #bits in hash */
 #define CRC32_POLY      0xEDB88320
 
-static void set_multicast_list(struct net_device *dev)
+static void set_multicast_list(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         struct netdev_hw_addr *ha;
         unsigned int i, bit, data, crc, tmp;
         unsigned char hash;
 
-        if (dev->flags & IFF_PROMISC) {
+        if (ndev->flags & IFF_PROMISC) {
                 tmp = readl(fep->hwp + FEC_R_CNTRL);
                 tmp |= 0x8;
                 writel(tmp, fep->hwp + FEC_R_CNTRL);
@@ -984,7 +1208,7 @@ static void set_multicast_list(struct net_device *dev)
         tmp &= ~0x8;
         writel(tmp, fep->hwp + FEC_R_CNTRL);
 
-        if (dev->flags & IFF_ALLMULTI) {
+        if (ndev->flags & IFF_ALLMULTI) {
                 /* Catch all multicast addresses, so set the
                  * filter to all 1's
                  */
@@ -999,7 +1223,7 @@ static void set_multicast_list(struct net_device *dev)
         writel(0, fep->hwp + FEC_GRP_HASH_TABLE_HIGH);
         writel(0, fep->hwp + FEC_GRP_HASH_TABLE_LOW);
 
-        netdev_for_each_mc_addr(ha, dev) {
+        netdev_for_each_mc_addr(ha, ndev) {
                 /* Only support group multicast for now */
                 if (!(ha->addr[0] & 1))
                         continue;
@@ -1007,7 +1231,7 @@ static void set_multicast_list(struct net_device *dev)
                 /* calculate crc32 value of mac address */
                 crc = 0xffffffff;
 
-                for (i = 0; i < dev->addr_len; i++) {
+                for (i = 0; i < ndev->addr_len; i++) {
                         data = ha->addr[i];
                         for (bit = 0; bit < 8; bit++, data >>= 1) {
                                 crc = (crc >> 1) ^
@@ -1034,20 +1258,20 @@ static void set_multicast_list(struct net_device *dev)
 
 /* Set a MAC change in hardware. */
 static int
-fec_set_mac_address(struct net_device *dev, void *p)
+fec_set_mac_address(struct net_device *ndev, void *p)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         struct sockaddr *addr = p;
 
         if (!is_valid_ether_addr(addr->sa_data))
                 return -EADDRNOTAVAIL;
 
-        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+        memcpy(ndev->dev_addr, addr->sa_data, ndev->addr_len);
 
-        writel(dev->dev_addr[3] | (dev->dev_addr[2] << 8) |
-                (dev->dev_addr[1] << 16) | (dev->dev_addr[0] << 24),
+        writel(ndev->dev_addr[3] | (ndev->dev_addr[2] << 8) |
+                (ndev->dev_addr[1] << 16) | (ndev->dev_addr[0] << 24),
                 fep->hwp + FEC_ADDR_LOW);
-        writel((dev->dev_addr[5] << 16) | (dev->dev_addr[4] << 24),
+        writel((ndev->dev_addr[5] << 16) | (ndev->dev_addr[4] << 24),
                 fep->hwp + FEC_ADDR_HIGH);
         return 0;
 }
@@ -1061,17 +1285,16 @@ static const struct net_device_ops fec_netdev_ops = {
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_tx_timeout         = fec_timeout,
         .ndo_set_mac_address    = fec_set_mac_address,
-        .ndo_do_ioctl           = fec_enet_ioctl,
+        .ndo_do_ioctl           = fec_enet_ioctl,
 };
 
  /*
   * XXX:  We need to clean up on failure exits here.
   *
-  * index is only used in legacy code
   */
-static int fec_enet_init(struct net_device *dev, int index)
+static int fec_enet_init(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         struct bufdesc *cbd_base;
         struct bufdesc *bdp;
         int i;
@@ -1086,35 +1309,19 @@ static int fec_enet_init(struct net_device *dev, int index)
 
         spin_lock_init(&fep->hw_lock);
 
-        fep->index = index;
-        fep->hwp = (void __iomem *)dev->base_addr;
-        fep->netdev = dev;
+        fep->netdev = ndev;
 
-        /* Set the Ethernet address */
-#ifdef CONFIG_M5272
-        fec_get_mac(dev);
-#else
-        {
-                unsigned long l;
-                l = readl(fep->hwp + FEC_ADDR_LOW);
-                dev->dev_addr[0] = (unsigned char)((l & 0xFF000000) >> 24);
-                dev->dev_addr[1] = (unsigned char)((l & 0x00FF0000) >> 16);
-                dev->dev_addr[2] = (unsigned char)((l & 0x0000FF00) >> 8);
-                dev->dev_addr[3] = (unsigned char)((l & 0x000000FF) >> 0);
-                l = readl(fep->hwp + FEC_ADDR_HIGH);
-                dev->dev_addr[4] = (unsigned char)((l & 0xFF000000) >> 24);
-                dev->dev_addr[5] = (unsigned char)((l & 0x00FF0000) >> 16);
-        }
-#endif
+        /* Get the Ethernet address */
+        fec_get_mac(ndev);
 
         /* Set receive and transmit descriptor base. */
         fep->rx_bd_base = cbd_base;
         fep->tx_bd_base = cbd_base + RX_RING_SIZE;
 
         /* The FEC Ethernet specific entries in the device structure */
-        dev->watchdog_timeo = TX_TIMEOUT;
-        dev->netdev_ops = &fec_netdev_ops;
-        dev->ethtool_ops = &fec_enet_ethtool_ops;
+        ndev->watchdog_timeo = TX_TIMEOUT;
+        ndev->netdev_ops = &fec_netdev_ops;
+        ndev->ethtool_ops = &fec_enet_ethtool_ops;
 
         /* Initialize the receive buffer descriptors. */
         bdp = fep->rx_bd_base;
@@ -1143,114 +1350,11 @@ static int fec_enet_init(struct net_device *dev, int index)
         bdp--;
         bdp->cbd_sc |= BD_SC_WRAP;
 
-        fec_restart(dev, 0);
+        fec_restart(ndev, 0);
 
         return 0;
 }
 
-/* This function is called to start or restart the FEC during a link
- * change.  This only happens when switching between half and full
- * duplex.
- */
-static void
-fec_restart(struct net_device *dev, int duplex)
-{
-        struct fec_enet_private *fep = netdev_priv(dev);
-        int i;
-
-        /* Whack a reset.  We should wait for this. */
-        writel(1, fep->hwp + FEC_ECNTRL);
-        udelay(10);
-
-        /* Clear any outstanding interrupt. */
-        writel(0xffc00000, fep->hwp + FEC_IEVENT);
-
-        /* Reset all multicast. */
-        writel(0, fep->hwp + FEC_GRP_HASH_TABLE_HIGH);
-        writel(0, fep->hwp + FEC_GRP_HASH_TABLE_LOW);
-#ifndef CONFIG_M5272
-        writel(0, fep->hwp + FEC_HASH_TABLE_HIGH);
-        writel(0, fep->hwp + FEC_HASH_TABLE_LOW);
-#endif
-
-        /* Set maximum receive buffer size. */
-        writel(PKT_MAXBLR_SIZE, fep->hwp + FEC_R_BUFF_SIZE);
-
-        /* Set receive and transmit descriptor base. */
-        writel(fep->bd_dma, fep->hwp + FEC_R_DES_START);
-        writel((unsigned long)fep->bd_dma + sizeof(struct bufdesc) * RX_RING_SIZE,
-                        fep->hwp + FEC_X_DES_START);
-
-        fep->dirty_tx = fep->cur_tx = fep->tx_bd_base;
-        fep->cur_rx = fep->rx_bd_base;
-
-        /* Reset SKB transmit buffers. */
-        fep->skb_cur = fep->skb_dirty = 0;
-        for (i = 0; i <= TX_RING_MOD_MASK; i++) {
-                if (fep->tx_skbuff[i]) {
-                        dev_kfree_skb_any(fep->tx_skbuff[i]);
-                        fep->tx_skbuff[i] = NULL;
-                }
-        }
-
-        /* Enable MII mode */
-        if (duplex) {
-                /* MII enable / FD enable */
-                writel(OPT_FRAME_SIZE | 0x04, fep->hwp + FEC_R_CNTRL);
-                writel(0x04, fep->hwp + FEC_X_CNTRL);
-        } else {
-                /* MII enable / No Rcv on Xmit */
-                writel(OPT_FRAME_SIZE | 0x06, fep->hwp + FEC_R_CNTRL);
-                writel(0x0, fep->hwp + FEC_X_CNTRL);
-        }
-        fep->full_duplex = duplex;
-
-        /* Set MII speed */
-        writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);
-
-#ifdef FEC_MIIGSK_ENR
-        if (fep->phy_interface == PHY_INTERFACE_MODE_RMII) {
-                /* disable the gasket and wait */
-                writel(0, fep->hwp + FEC_MIIGSK_ENR);
-                while (readl(fep->hwp + FEC_MIIGSK_ENR) & 4)
-                        udelay(1);
-
-                /* configure the gasket: RMII, 50 MHz, no loopback, no echo */
-                writel(1, fep->hwp + FEC_MIIGSK_CFGR);
-
-                /* re-enable the gasket */
-                writel(2, fep->hwp + FEC_MIIGSK_ENR);
-        }
-#endif
-
-        /* And last, enable the transmit and receive processing */
-        writel(2, fep->hwp + FEC_ECNTRL);
-        writel(0, fep->hwp + FEC_R_DES_ACTIVE);
-
-        /* Enable interrupts we wish to service */
-        writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK);
-}
-
-static void
-fec_stop(struct net_device *dev)
-{
-        struct fec_enet_private *fep = netdev_priv(dev);
-
-        /* We cannot expect a graceful transmit stop without link !!! */
-        if (fep->link) {
-                writel(1, fep->hwp + FEC_X_CNTRL); /* Graceful transmit stop */
-                udelay(10);
-                if (!(readl(fep->hwp + FEC_IEVENT) & FEC_ENET_GRA))
-                        printk("fec_stop : Graceful transmit stop did not complete !\n");
-        }
-
-        /* Whack a reset.  We should wait for this. */
-        writel(1, fep->hwp + FEC_ECNTRL);
-        udelay(10);
-        writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);
-        writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK);
-}
-
 static int __devinit
 fec_probe(struct platform_device *pdev)
 {
@@ -1270,19 +1374,20 @@ fec_probe(struct platform_device *pdev)
 
         /* Init network device */
         ndev = alloc_etherdev(sizeof(struct fec_enet_private));
-        if (!ndev)
-                return -ENOMEM;
+        if (!ndev) {
+                ret = -ENOMEM;
+                goto failed_alloc_etherdev;
+        }
 
         SET_NETDEV_DEV(ndev, &pdev->dev);
 
         /* setup board info structure */
         fep = netdev_priv(ndev);
-        memset(fep, 0, sizeof(*fep));
 
-        ndev->base_addr = (unsigned long)ioremap(r->start, resource_size(r));
+        fep->hwp = ioremap(r->start, resource_size(r));
         fep->pdev = pdev;
 
-        if (!ndev->base_addr) {
+        if (!fep->hwp) {
                 ret = -ENOMEM;
                 goto failed_ioremap;
         }
@@ -1300,10 +1405,9 @@ fec_probe(struct platform_device *pdev)
                         break;
                 ret = request_irq(irq, fec_enet_interrupt, IRQF_DISABLED, pdev->name, ndev);
                 if (ret) {
-                        while (i >= 0) {
+                        while (--i >= 0) {
                                 irq = platform_get_irq(pdev, i);
                                 free_irq(irq, ndev);
-                                i--;
                         }
                         goto failed_irq;
                 }
@@ -1316,7 +1420,7 @@ fec_probe(struct platform_device *pdev)
         }
         clk_enable(fep->clk);
 
-        ret = fec_enet_init(ndev, 0);
+        ret = fec_enet_init(ndev);
         if (ret)
                 goto failed_init;
 
@@ -1346,9 +1450,11 @@ failed_clk:
                         free_irq(irq, ndev);
         }
 failed_irq:
-        iounmap((void __iomem *)ndev->base_addr);
+        iounmap(fep->hwp);
 failed_ioremap:
         free_netdev(ndev);
+failed_alloc_etherdev:
+        release_mem_region(r->start, resource_size(r));
 
         return ret;
 }
@@ -1358,16 +1464,22 @@ fec_drv_remove(struct platform_device *pdev)
 {
         struct net_device *ndev = platform_get_drvdata(pdev);
         struct fec_enet_private *fep = netdev_priv(ndev);
-
-        platform_set_drvdata(pdev, NULL);
+        struct resource *r;
 
         fec_stop(ndev);
         fec_enet_mii_remove(fep);
         clk_disable(fep->clk);
         clk_put(fep->clk);
-        iounmap((void __iomem *)ndev->base_addr);
+        iounmap(fep->hwp);
         unregister_netdev(ndev);
         free_netdev(ndev);
+
+        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        BUG_ON(!r);
+        release_mem_region(r->start, resource_size(r));
+
+        platform_set_drvdata(pdev, NULL);
+
         return 0;
 }
 
@@ -1376,14 +1488,14 @@ static int
 fec_suspend(struct device *dev)
 {
         struct net_device *ndev = dev_get_drvdata(dev);
-        struct fec_enet_private *fep;
+        struct fec_enet_private *fep = netdev_priv(ndev);
 
-        if (ndev) {
-                fep = netdev_priv(ndev);
-                if (netif_running(ndev))
-                        fec_enet_close(ndev);
-                clk_disable(fep->clk);
+        if (netif_running(ndev)) {
+                fec_stop(ndev);
+                netif_device_detach(ndev);
         }
+        clk_disable(fep->clk);
+
         return 0;
 }
 
@@ -1391,14 +1503,14 @@ static int
 fec_resume(struct device *dev)
 {
         struct net_device *ndev = dev_get_drvdata(dev);
-        struct fec_enet_private *fep;
+        struct fec_enet_private *fep = netdev_priv(ndev);
 
-        if (ndev) {
-                fep = netdev_priv(ndev);
-                clk_enable(fep->clk);
-                if (netif_running(ndev))
-                        fec_enet_open(ndev);
+        clk_enable(fep->clk);
+        if (netif_running(ndev)) {
+                fec_restart(ndev, fep->full_duplex);
+                netif_device_attach(ndev);
         }
+
         return 0;
 }
 
@@ -1414,12 +1526,13 @@ static const struct dev_pm_ops fec_pm_ops = {
 
 static struct platform_driver fec_driver = {
         .driver = {
-                .name   = "fec",
+                .name   = DRIVER_NAME,
                 .owner  = THIS_MODULE,
 #ifdef CONFIG_PM
                 .pm     = &fec_pm_ops,
 #endif
         },
+        .id_table = fec_devtype,
         .probe  = fec_probe,
         .remove = __devexit_p(fec_drv_remove),
 };