CAN: add controller hardware name for Softing cards
[linux-2.6.git] / drivers / net / au1000_eth.c
index cd0b1dc..b9debcf 100644 (file)
@@ -2,15 +2,18 @@
  *
  * Alchemy Au1x00 ethernet driver
  *
- * Copyright 2001,2002,2003 MontaVista Software Inc.
+ * Copyright 2001-2003, 2006 MontaVista Software Inc.
  * Copyright 2002 TimeSys Corp.
  * Added ethtool/mii-tool support,
  * Copyright 2004 Matt Porter <mporter@kernel.crashing.org>
- * Update: 2004 Bjoern Riemer, riemer@fokus.fraunhofer.de 
- * or riemer@riemer-nt.de: fixed the link beat detection with 
+ * Update: 2004 Bjoern Riemer, riemer@fokus.fraunhofer.de
+ * or riemer@riemer-nt.de: fixed the link beat detection with
  * ioctls (SIOCGMIIPHY)
+ * Copyright 2006 Herbert Valerio Riedel <hvr@gnu.org>
+ *  converted to use linux-2.6.x's PHY framework
+ *
  * Author: MontaVista Software, Inc.
- *             ppopov@mvista.com or source@mvista.com
+ *             ppopov@mvista.com or source@mvista.com
  *
  * ########################################################################
  *
  *
  * ########################################################################
  *
- * 
+ *
  */
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <linux/config.h>
+#include <linux/capability.h>
+#include <linux/dma-mapping.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/string.h>
 #include <linux/timer.h>
 #include <linux/errno.h>
@@ -44,7 +48,6 @@
 #include <linux/bitops.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/mii.h>
 #include <linux/skbuff.h>
 #include <linux/delay.h>
+#include <linux/crc32.h>
+#include <linux/phy.h>
+#include <linux/platform_device.h>
+#include <linux/cpu.h>
+#include <linux/io.h>
+
 #include <asm/mipsregs.h>
 #include <asm/irq.h>
-#include <asm/io.h>
 #include <asm/processor.h>
 
-#include <asm/mach-au1x00/au1000.h>
-#include <asm/cpu.h>
+#include <au1000.h>
+#include <au1xxx_eth.h>
+#include <prom.h>
+
 #include "au1000_eth.h"
 
 #ifdef AU1000_ETH_DEBUG
@@ -67,986 +77,394 @@ static int au1000_debug = 5;
 static int au1000_debug = 3;
 #endif
 
-#define DRV_NAME       "au1000eth"
-#define DRV_VERSION    "1.5"
+#define AU1000_DEF_MSG_ENABLE  (NETIF_MSG_DRV  | \
+                               NETIF_MSG_PROBE | \
+                               NETIF_MSG_LINK)
+
+#define DRV_NAME       "au1000_eth"
+#define DRV_VERSION    "1.7"
 #define DRV_AUTHOR     "Pete Popov <ppopov@embeddedalley.com>"
 #define DRV_DESC       "Au1xxx on-chip Ethernet driver"
 
 MODULE_AUTHOR(DRV_AUTHOR);
 MODULE_DESCRIPTION(DRV_DESC);
 MODULE_LICENSE("GPL");
-
-// prototypes
-static void hard_stop(struct net_device *);
-static void enable_rx_tx(struct net_device *dev);
-static struct net_device * au1000_probe(u32 ioaddr, int irq, int port_num);
-static int au1000_init(struct net_device *);
-static int au1000_open(struct net_device *);
-static int au1000_close(struct net_device *);
-static int au1000_tx(struct sk_buff *, struct net_device *);
-static int au1000_rx(struct net_device *);
-static irqreturn_t au1000_interrupt(int, void *, struct pt_regs *);
-static void au1000_tx_timeout(struct net_device *);
-static int au1000_set_config(struct net_device *dev, struct ifmap *map);
-static void set_rx_mode(struct net_device *);
-static struct net_device_stats *au1000_get_stats(struct net_device *);
-static inline void update_tx_stats(struct net_device *, u32, u32);
-static inline void update_rx_stats(struct net_device *, u32);
-static void au1000_timer(unsigned long);
-static int au1000_ioctl(struct net_device *, struct ifreq *, int);
-static int mdio_read(struct net_device *, int, int);
-static void mdio_write(struct net_device *, int, int, u16);
-static void dump_mii(struct net_device *dev, int phy_id);
-
-// externs
-extern  void ack_rise_edge_irq(unsigned int);
-extern int get_ethernet_addr(char *ethernet_addr);
-extern void str2eaddr(unsigned char *ea, unsigned char *str);
-extern char * __init prom_getcmdline(void);
+MODULE_VERSION(DRV_VERSION);
 
 /*
  * Theory of operation
  *
- * The Au1000 MACs use a simple rx and tx descriptor ring scheme. 
- * There are four receive and four transmit descriptors.  These 
- * descriptors are not in memory; rather, they are just a set of 
+ * The Au1000 MACs use a simple rx and tx descriptor ring scheme.
+ * There are four receive and four transmit descriptors.  These
+ * descriptors are not in memory; rather, they are just a set of
  * hardware registers.
  *
  * Since the Au1000 has a coherent data cache, the receive and
- * transmit buffers are allocated from the KSEG0 segment. The 
+ * transmit buffers are allocated from the KSEG0 segment. The
  * hardware registers, however, are still mapped at KSEG1 to
  * make sure there's no out-of-order writes, and that all writes
  * complete immediately.
  */
 
-/* These addresses are only used if yamon doesn't tell us what
- * the mac address is, and the mac address is not passed on the
- * command line.
+/*
+ * board-specific configurations
+ *
+ * PHY detection algorithm
+ *
+ * If phy_static_config is undefined, the PHY setup is
+ * autodetected:
+ *
+ * mii_probe() first searches the current MAC's MII bus for a PHY,
+ * selecting the first (or last, if phy_search_highest_addr is
+ * defined) PHY address not already claimed by another netdev.
+ *
+ * If nothing was found that way when searching for the 2nd ethernet
+ * controller's PHY and phy1_search_mac0 is defined, then
+ * the first MII bus is searched as well for an unclaimed PHY; this is
+ * needed in case of a dual-PHY accessible only through the MAC0's MII
+ * bus.
+ *
+ * Finally, if no PHY is found, then the corresponding ethernet
+ * controller is not registered to the network subsystem.
  */
-static unsigned char au1000_mac_addr[6] __devinitdata = { 
-       0x00, 0x50, 0xc2, 0x0c, 0x30, 0x00
-};
 
-#define nibswap(x) ((((x) >> 4) & 0x0f) | (((x) << 4) & 0xf0))
-#define RUN_AT(x) (jiffies + (x))
+/* autodetection defaults: phy1_search_mac0 */
 
-// For reading/writing 32-bit words from/to DMA memory
-#define cpu_to_dma32 cpu_to_be32
-#define dma32_to_cpu be32_to_cpu
-
-struct au1000_private *au_macs[NUM_ETH_INTERFACES];
-
-/* FIXME 
- * All of the PHY code really should be detached from the MAC 
- * code.
+/* static PHY setup
+ *
+ * most boards PHY setup should be detectable properly with the
+ * autodetection algorithm in mii_probe(), but in some cases (e.g. if
+ * you have a switch attached, or want to use the PHY's interrupt
+ * notification capabilities) you can provide a static PHY
+ * configuration here
+ *
+ * IRQs may only be set, if a PHY address was configured
+ * If a PHY address is given, also a bus id is required to be set
+ *
+ * ps: make sure the used irqs are configured properly in the board
+ * specific irq-map
  */
 
-/* Default advertise */
-#define GENMII_DEFAULT_ADVERTISE \
-       ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full | \
-       ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full | \
-       ADVERTISED_Autoneg
-
-#define GENMII_DEFAULT_FEATURES \
-       SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full | \
-       SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full | \
-       SUPPORTED_Autoneg
-
-int bcm_5201_init(struct net_device *dev, int phy_addr)
+static void au1000_enable_mac(struct net_device *dev, int force_reset)
 {
-       s16 data;
-       
-       /* Stop auto-negotiation */
-       data = mdio_read(dev, phy_addr, MII_CONTROL);
-       mdio_write(dev, phy_addr, MII_CONTROL, data & ~MII_CNTL_AUTO);
-
-       /* Set advertisement to 10/100 and Half/Full duplex
-        * (full capabilities) */
-       data = mdio_read(dev, phy_addr, MII_ANADV);
-       data |= MII_NWAY_TX | MII_NWAY_TX_FDX | MII_NWAY_T_FDX | MII_NWAY_T;
-       mdio_write(dev, phy_addr, MII_ANADV, data);
-       
-       /* Restart auto-negotiation */
-       data = mdio_read(dev, phy_addr, MII_CONTROL);
-       data |= MII_CNTL_RST_AUTO | MII_CNTL_AUTO;
-       mdio_write(dev, phy_addr, MII_CONTROL, data);
-
-       if (au1000_debug > 4) 
-               dump_mii(dev, phy_addr);
-       return 0;
-}
-
-int bcm_5201_reset(struct net_device *dev, int phy_addr)
-{
-       s16 mii_control, timeout;
-       
-       mii_control = mdio_read(dev, phy_addr, MII_CONTROL);
-       mdio_write(dev, phy_addr, MII_CONTROL, mii_control | MII_CNTL_RESET);
-       mdelay(1);
-       for (timeout = 100; timeout > 0; --timeout) {
-               mii_control = mdio_read(dev, phy_addr, MII_CONTROL);
-               if ((mii_control & MII_CNTL_RESET) == 0)
-                       break;
-               mdelay(1);
-       }
-       if (mii_control & MII_CNTL_RESET) {
-               printk(KERN_ERR "%s PHY reset timeout !\n", dev->name);
-               return -1;
-       }
-       return 0;
-}
+       unsigned long flags;
+       struct au1000_private *aup = netdev_priv(dev);
 
-int 
-bcm_5201_status(struct net_device *dev, int phy_addr, u16 *link, u16 *speed)
-{
-       u16 mii_data;
-       struct au1000_private *aup;
+       spin_lock_irqsave(&aup->lock, flags);
 
-       if (!dev) {
-               printk(KERN_ERR "bcm_5201_status error: NULL dev\n");
-               return -1;
-       }
-       aup = (struct au1000_private *) dev->priv;
-
-       mii_data = mdio_read(dev, aup->phy_addr, MII_STATUS);
-       if (mii_data & MII_STAT_LINK) {
-               *link = 1;
-               mii_data = mdio_read(dev, aup->phy_addr, MII_AUX_CNTRL);
-               if (mii_data & MII_AUX_100) {
-                       if (mii_data & MII_AUX_FDX) {
-                               *speed = IF_PORT_100BASEFX;
-                               dev->if_port = IF_PORT_100BASEFX;
-                       }
-                       else {
-                               *speed = IF_PORT_100BASETX;
-                               dev->if_port = IF_PORT_100BASETX;
-                       }
-               }
-               else  {
-                       *speed = IF_PORT_10BASET;
-                       dev->if_port = IF_PORT_10BASET;
-               }
+       if (force_reset || (!aup->mac_enabled)) {
+               writel(MAC_EN_CLOCK_ENABLE, aup->enable);
+               au_sync_delay(2);
+               writel((MAC_EN_RESET0 | MAC_EN_RESET1 | MAC_EN_RESET2
+                               | MAC_EN_CLOCK_ENABLE), aup->enable);
+               au_sync_delay(2);
 
+               aup->mac_enabled = 1;
        }
-       else {
-               *link = 0;
-               *speed = 0;
-               dev->if_port = IF_PORT_UNKNOWN;
-       }
-       return 0;
-}
 
-int lsi_80227_init(struct net_device *dev, int phy_addr)
-{
-       if (au1000_debug > 4)
-               printk("lsi_80227_init\n");
-
-       /* restart auto-negotiation */
-       mdio_write(dev, phy_addr, MII_CONTROL,
-                  MII_CNTL_F100 | MII_CNTL_AUTO | MII_CNTL_RST_AUTO); // | MII_CNTL_FDX);
-       mdelay(1);
-
-       /* set up LEDs to correct display */
-#ifdef CONFIG_MIPS_MTX1
-       mdio_write(dev, phy_addr, 17, 0xff80);
-#else
-       mdio_write(dev, phy_addr, 17, 0xffc0);
-#endif
-
-       if (au1000_debug > 4)
-               dump_mii(dev, phy_addr);
-       return 0;
+       spin_unlock_irqrestore(&aup->lock, flags);
 }
 
-int lsi_80227_reset(struct net_device *dev, int phy_addr)
+/*
+ * MII operations
+ */
+static int au1000_mdio_read(struct net_device *dev, int phy_addr, int reg)
 {
-       s16 mii_control, timeout;
-       
-       if (au1000_debug > 4) {
-               printk("lsi_80227_reset\n");
-               dump_mii(dev, phy_addr);
-       }
+       struct au1000_private *aup = netdev_priv(dev);
+       u32 *const mii_control_reg = &aup->mac->mii_control;
+       u32 *const mii_data_reg = &aup->mac->mii_data;
+       u32 timedout = 20;
+       u32 mii_control;
 
-       mii_control = mdio_read(dev, phy_addr, MII_CONTROL);
-       mdio_write(dev, phy_addr, MII_CONTROL, mii_control | MII_CNTL_RESET);
-       mdelay(1);
-       for (timeout = 100; timeout > 0; --timeout) {
-               mii_control = mdio_read(dev, phy_addr, MII_CONTROL);
-               if ((mii_control & MII_CNTL_RESET) == 0)
-                       break;
+       while (readl(mii_control_reg) & MAC_MII_BUSY) {
                mdelay(1);
-       }
-       if (mii_control & MII_CNTL_RESET) {
-               printk(KERN_ERR "%s PHY reset timeout !\n", dev->name);
-               return -1;
-       }
-       return 0;
-}
-
-int
-lsi_80227_status(struct net_device *dev, int phy_addr, u16 *link, u16 *speed)
-{
-       u16 mii_data;
-       struct au1000_private *aup;
-
-       if (!dev) {
-               printk(KERN_ERR "lsi_80227_status error: NULL dev\n");
-               return -1;
-       }
-       aup = (struct au1000_private *) dev->priv;
-
-       mii_data = mdio_read(dev, aup->phy_addr, MII_STATUS);
-       if (mii_data & MII_STAT_LINK) {
-               *link = 1;
-               mii_data = mdio_read(dev, aup->phy_addr, MII_LSI_PHY_STAT);
-               if (mii_data & MII_LSI_PHY_STAT_SPD) {
-                       if (mii_data & MII_LSI_PHY_STAT_FDX) {
-                               *speed = IF_PORT_100BASEFX;
-                               dev->if_port = IF_PORT_100BASEFX;
-                       }
-                       else {
-                               *speed = IF_PORT_100BASETX;
-                               dev->if_port = IF_PORT_100BASETX;
-                       }
-               }
-               else  {
-                       *speed = IF_PORT_10BASET;
-                       dev->if_port = IF_PORT_10BASET;
+               if (--timedout == 0) {
+                       netdev_err(dev, "read_MII busy timeout!!\n");
+                       return -1;
                }
-
-       }
-       else {
-               *link = 0;
-               *speed = 0;
-               dev->if_port = IF_PORT_UNKNOWN;
        }
-       return 0;
-}
 
-int am79c901_init(struct net_device *dev, int phy_addr)
-{
-       printk("am79c901_init\n");
-       return 0;
-}
+       mii_control = MAC_SET_MII_SELECT_REG(reg) |
+               MAC_SET_MII_SELECT_PHY(phy_addr) | MAC_MII_READ;
 
-int am79c901_reset(struct net_device *dev, int phy_addr)
-{
-       printk("am79c901_reset\n");
-       return 0;
-}
-
-int 
-am79c901_status(struct net_device *dev, int phy_addr, u16 *link, u16 *speed)
-{
-       return 0;
-}
-
-int am79c874_init(struct net_device *dev, int phy_addr)
-{
-       s16 data;
+       writel(mii_control, mii_control_reg);
 
-       /* 79c874 has quit resembled bit assignments to BCM5201 */
-       if (au1000_debug > 4)
-               printk("am79c847_init\n");
-
-       /* Stop auto-negotiation */
-       data = mdio_read(dev, phy_addr, MII_CONTROL);
-       mdio_write(dev, phy_addr, MII_CONTROL, data & ~MII_CNTL_AUTO);
-
-       /* Set advertisement to 10/100 and Half/Full duplex
-        * (full capabilities) */
-       data = mdio_read(dev, phy_addr, MII_ANADV);
-       data |= MII_NWAY_TX | MII_NWAY_TX_FDX | MII_NWAY_T_FDX | MII_NWAY_T;
-       mdio_write(dev, phy_addr, MII_ANADV, data);
-       
-       /* Restart auto-negotiation */
-       data = mdio_read(dev, phy_addr, MII_CONTROL);
-       data |= MII_CNTL_RST_AUTO | MII_CNTL_AUTO;
-
-       mdio_write(dev, phy_addr, MII_CONTROL, data);
-
-       if (au1000_debug > 4) dump_mii(dev, phy_addr);
-       return 0;
-}
-
-int am79c874_reset(struct net_device *dev, int phy_addr)
-{
-       s16 mii_control, timeout;
-       
-       if (au1000_debug > 4)
-               printk("am79c874_reset\n");
-
-       mii_control = mdio_read(dev, phy_addr, MII_CONTROL);
-       mdio_write(dev, phy_addr, MII_CONTROL, mii_control | MII_CNTL_RESET);
-       mdelay(1);
-       for (timeout = 100; timeout > 0; --timeout) {
-               mii_control = mdio_read(dev, phy_addr, MII_CONTROL);
-               if ((mii_control & MII_CNTL_RESET) == 0)
-                       break;
+       timedout = 20;
+       while (readl(mii_control_reg) & MAC_MII_BUSY) {
                mdelay(1);
-       }
-       if (mii_control & MII_CNTL_RESET) {
-               printk(KERN_ERR "%s PHY reset timeout !\n", dev->name);
-               return -1;
-       }
-       return 0;
-}
-
-int 
-am79c874_status(struct net_device *dev, int phy_addr, u16 *link, u16 *speed)
-{
-       u16 mii_data;
-       struct au1000_private *aup;
-
-       // printk("am79c874_status\n");
-       if (!dev) {
-               printk(KERN_ERR "am79c874_status error: NULL dev\n");
-               return -1;
-       }
-
-       aup = (struct au1000_private *) dev->priv;
-       mii_data = mdio_read(dev, aup->phy_addr, MII_STATUS);
-
-       if (mii_data & MII_STAT_LINK) {
-               *link = 1;
-               mii_data = mdio_read(dev, aup->phy_addr, MII_AMD_PHY_STAT);
-               if (mii_data & MII_AMD_PHY_STAT_SPD) {
-                       if (mii_data & MII_AMD_PHY_STAT_FDX) {
-                               *speed = IF_PORT_100BASEFX;
-                               dev->if_port = IF_PORT_100BASEFX;
-                       }
-                       else {
-                               *speed = IF_PORT_100BASETX;
-                               dev->if_port = IF_PORT_100BASETX;
-                       }
-               }
-               else {
-                       *speed = IF_PORT_10BASET;
-                       dev->if_port = IF_PORT_10BASET;
+               if (--timedout == 0) {
+                       netdev_err(dev, "mdio_read busy timeout!!\n");
+                       return -1;
                }
-
        }
-       else {
-               *link = 0;
-               *speed = 0;
-               dev->if_port = IF_PORT_UNKNOWN;
-       }
-       return 0;
-}
-
-int lxt971a_init(struct net_device *dev, int phy_addr)
-{
-       if (au1000_debug > 4)
-               printk("lxt971a_init\n");
-
-       /* restart auto-negotiation */
-       mdio_write(dev, phy_addr, MII_CONTROL,
-                  MII_CNTL_F100 | MII_CNTL_AUTO | MII_CNTL_RST_AUTO | MII_CNTL_FDX);
-
-       /* set up LEDs to correct display */
-       mdio_write(dev, phy_addr, 20, 0x0422);
-
-       if (au1000_debug > 4)
-               dump_mii(dev, phy_addr);
-       return 0;
+       return readl(mii_data_reg);
 }
 
-int lxt971a_reset(struct net_device *dev, int phy_addr)
+static void au1000_mdio_write(struct net_device *dev, int phy_addr,
+                             int reg, u16 value)
 {
-       s16 mii_control, timeout;
-       
-       if (au1000_debug > 4) {
-               printk("lxt971a_reset\n");
-               dump_mii(dev, phy_addr);
-       }
+       struct au1000_private *aup = netdev_priv(dev);
+       u32 *const mii_control_reg = &aup->mac->mii_control;
+       u32 *const mii_data_reg = &aup->mac->mii_data;
+       u32 timedout = 20;
+       u32 mii_control;
 
-       mii_control = mdio_read(dev, phy_addr, MII_CONTROL);
-       mdio_write(dev, phy_addr, MII_CONTROL, mii_control | MII_CNTL_RESET);
-       mdelay(1);
-       for (timeout = 100; timeout > 0; --timeout) {
-               mii_control = mdio_read(dev, phy_addr, MII_CONTROL);
-               if ((mii_control & MII_CNTL_RESET) == 0)
-                       break;
+       while (readl(mii_control_reg) & MAC_MII_BUSY) {
                mdelay(1);
+               if (--timedout == 0) {
+                       netdev_err(dev, "mdio_write busy timeout!!\n");
+                       return;
+               }
        }
-       if (mii_control & MII_CNTL_RESET) {
-               printk(KERN_ERR "%s PHY reset timeout !\n", dev->name);
-               return -1;
-       }
-       return 0;
-}
-
-int
-lxt971a_status(struct net_device *dev, int phy_addr, u16 *link, u16 *speed)
-{
-       u16 mii_data;
-       struct au1000_private *aup;
 
-       if (!dev) {
-               printk(KERN_ERR "lxt971a_status error: NULL dev\n");
-               return -1;
-       }
-       aup = (struct au1000_private *) dev->priv;
-
-       mii_data = mdio_read(dev, aup->phy_addr, MII_STATUS);
-       if (mii_data & MII_STAT_LINK) {
-               *link = 1;
-               mii_data = mdio_read(dev, aup->phy_addr, MII_INTEL_PHY_STAT);
-               if (mii_data & MII_INTEL_PHY_STAT_SPD) {
-                       if (mii_data & MII_INTEL_PHY_STAT_FDX) {
-                               *speed = IF_PORT_100BASEFX;
-                               dev->if_port = IF_PORT_100BASEFX;
-                       }
-                       else {
-                               *speed = IF_PORT_100BASETX;
-                               dev->if_port = IF_PORT_100BASETX;
-                       }
-               }
-               else  {
-                       *speed = IF_PORT_10BASET;
-                       dev->if_port = IF_PORT_10BASET;
-               }
+       mii_control = MAC_SET_MII_SELECT_REG(reg) |
+               MAC_SET_MII_SELECT_PHY(phy_addr) | MAC_MII_WRITE;
 
-       }
-       else {
-               *link = 0;
-               *speed = 0;
-               dev->if_port = IF_PORT_UNKNOWN;
-       }
-       return 0;
+       writel(value, mii_data_reg);
+       writel(mii_control, mii_control_reg);
 }
 
-int ks8995m_init(struct net_device *dev, int phy_addr)
+static int au1000_mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum)
 {
-       s16 data;
-       
-//     printk("ks8995m_init\n");
-       /* Stop auto-negotiation */
-       data = mdio_read(dev, phy_addr, MII_CONTROL);
-       mdio_write(dev, phy_addr, MII_CONTROL, data & ~MII_CNTL_AUTO);
-
-       /* Set advertisement to 10/100 and Half/Full duplex
-        * (full capabilities) */
-       data = mdio_read(dev, phy_addr, MII_ANADV);
-       data |= MII_NWAY_TX | MII_NWAY_TX_FDX | MII_NWAY_T_FDX | MII_NWAY_T;
-       mdio_write(dev, phy_addr, MII_ANADV, data);
-       
-       /* Restart auto-negotiation */
-       data = mdio_read(dev, phy_addr, MII_CONTROL);
-       data |= MII_CNTL_RST_AUTO | MII_CNTL_AUTO;
-       mdio_write(dev, phy_addr, MII_CONTROL, data);
-
-       if (au1000_debug > 4) dump_mii(dev, phy_addr);
+       /* WARNING: bus->phy_map[phy_addr].attached_dev == dev does
+        * _NOT_ hold (e.g. when PHY is accessed through other MAC's MII bus)
+        */
+       struct net_device *const dev = bus->priv;
 
-       return 0;
-}
+       /* make sure the MAC associated with this
+        * mii_bus is enabled
+        */
+       au1000_enable_mac(dev, 0);
 
-int ks8995m_reset(struct net_device *dev, int phy_addr)
-{
-       s16 mii_control, timeout;
-       
-//     printk("ks8995m_reset\n");
-       mii_control = mdio_read(dev, phy_addr, MII_CONTROL);
-       mdio_write(dev, phy_addr, MII_CONTROL, mii_control | MII_CNTL_RESET);
-       mdelay(1);
-       for (timeout = 100; timeout > 0; --timeout) {
-               mii_control = mdio_read(dev, phy_addr, MII_CONTROL);
-               if ((mii_control & MII_CNTL_RESET) == 0)
-                       break;
-               mdelay(1);
-       }
-       if (mii_control & MII_CNTL_RESET) {
-               printk(KERN_ERR "%s PHY reset timeout !\n", dev->name);
-               return -1;
-       }
-       return 0;
+       return au1000_mdio_read(dev, phy_addr, regnum);
 }
 
-int ks8995m_status(struct net_device *dev, int phy_addr, u16 *link, u16 *speed)
+static int au1000_mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum,
+                               u16 value)
 {
-       u16 mii_data;
-       struct au1000_private *aup;
+       struct net_device *const dev = bus->priv;
 
-       if (!dev) {
-               printk(KERN_ERR "ks8995m_status error: NULL dev\n");
-               return -1;
-       }
-       aup = (struct au1000_private *) dev->priv;
-
-       mii_data = mdio_read(dev, aup->phy_addr, MII_STATUS);
-       if (mii_data & MII_STAT_LINK) {
-               *link = 1;
-               mii_data = mdio_read(dev, aup->phy_addr, MII_AUX_CNTRL);
-               if (mii_data & MII_AUX_100) {
-                       if (mii_data & MII_AUX_FDX) {
-                               *speed = IF_PORT_100BASEFX;
-                               dev->if_port = IF_PORT_100BASEFX;
-                       }
-                       else {
-                               *speed = IF_PORT_100BASETX;
-                               dev->if_port = IF_PORT_100BASETX;
-                       }
-               }
-               else  {                                                                                 
-                       *speed = IF_PORT_10BASET;
-                       dev->if_port = IF_PORT_10BASET;
-               }
+       /* make sure the MAC associated with this
+        * mii_bus is enabled
+        */
+       au1000_enable_mac(dev, 0);
 
-       }
-       else {
-               *link = 0;
-               *speed = 0;
-               dev->if_port = IF_PORT_UNKNOWN;
-       }
+       au1000_mdio_write(dev, phy_addr, regnum, value);
        return 0;
 }
 
-int
-smsc_83C185_init (struct net_device *dev, int phy_addr)
+static int au1000_mdiobus_reset(struct mii_bus *bus)
 {
-       s16 data;
-
-       if (au1000_debug > 4)
-               printk("smsc_83C185_init\n");
-
-       /* Stop auto-negotiation */
-       data = mdio_read(dev, phy_addr, MII_CONTROL);
-       mdio_write(dev, phy_addr, MII_CONTROL, data & ~MII_CNTL_AUTO);
+       struct net_device *const dev = bus->priv;
 
-       /* Set advertisement to 10/100 and Half/Full duplex
-        * (full capabilities) */
-       data = mdio_read(dev, phy_addr, MII_ANADV);
-       data |= MII_NWAY_TX | MII_NWAY_TX_FDX | MII_NWAY_T_FDX | MII_NWAY_T;
-       mdio_write(dev, phy_addr, MII_ANADV, data);
-       
-       /* Restart auto-negotiation */
-       data = mdio_read(dev, phy_addr, MII_CONTROL);
-       data |= MII_CNTL_RST_AUTO | MII_CNTL_AUTO;
-
-       mdio_write(dev, phy_addr, MII_CONTROL, data);
+       /* make sure the MAC associated with this
+        * mii_bus is enabled
+        */
+       au1000_enable_mac(dev, 0);
 
-       if (au1000_debug > 4) dump_mii(dev, phy_addr);
        return 0;
 }
 
-int
-smsc_83C185_reset (struct net_device *dev, int phy_addr)
+static void au1000_hard_stop(struct net_device *dev)
 {
-       s16 mii_control, timeout;
-       
-       if (au1000_debug > 4)
-               printk("smsc_83C185_reset\n");
-
-       mii_control = mdio_read(dev, phy_addr, MII_CONTROL);
-       mdio_write(dev, phy_addr, MII_CONTROL, mii_control | MII_CNTL_RESET);
-       mdelay(1);
-       for (timeout = 100; timeout > 0; --timeout) {
-               mii_control = mdio_read(dev, phy_addr, MII_CONTROL);
-               if ((mii_control & MII_CNTL_RESET) == 0)
-                       break;
-               mdelay(1);
-       }
-       if (mii_control & MII_CNTL_RESET) {
-               printk(KERN_ERR "%s PHY reset timeout !\n", dev->name);
-               return -1;
-       }
-       return 0;
-}
+       struct au1000_private *aup = netdev_priv(dev);
+       u32 reg;
 
-int 
-smsc_83C185_status (struct net_device *dev, int phy_addr, u16 *link, u16 *speed)
-{
-       u16 mii_data;
-       struct au1000_private *aup;
+       netif_dbg(aup, drv, dev, "hard stop\n");
 
-       if (!dev) {
-               printk(KERN_ERR "smsc_83C185_status error: NULL dev\n");
-               return -1;
-       }
-
-       aup = (struct au1000_private *) dev->priv;
-       mii_data = mdio_read(dev, aup->phy_addr, MII_STATUS);
-
-       if (mii_data & MII_STAT_LINK) {
-               *link = 1;
-               mii_data = mdio_read(dev, aup->phy_addr, 0x1f);
-               if (mii_data & (1<<3)) {
-                       if (mii_data & (1<<4)) {
-                               *speed = IF_PORT_100BASEFX;
-                               dev->if_port = IF_PORT_100BASEFX;
-                       }
-                       else {
-                               *speed = IF_PORT_100BASETX;
-                               dev->if_port = IF_PORT_100BASETX;
-                       }
-               }
-               else {
-                       *speed = IF_PORT_10BASET;
-                       dev->if_port = IF_PORT_10BASET;
-               }
-       }
-       else {
-               *link = 0;
-               *speed = 0;
-               dev->if_port = IF_PORT_UNKNOWN;
-       }
-       return 0;
+       reg = readl(&aup->mac->control);
+       reg &= ~(MAC_RX_ENABLE | MAC_TX_ENABLE);
+       writel(reg, &aup->mac->control);
+       au_sync_delay(10);
 }
 
-
-#ifdef CONFIG_MIPS_BOSPORUS
-int stub_init(struct net_device *dev, int phy_addr)
+static void au1000_enable_rx_tx(struct net_device *dev)
 {
-       //printk("PHY stub_init\n");
-       return 0;
-}
+       struct au1000_private *aup = netdev_priv(dev);
+       u32 reg;
 
-int stub_reset(struct net_device *dev, int phy_addr)
-{
-       //printk("PHY stub_reset\n");
-       return 0;
-}
+       netif_dbg(aup, hw, dev, "enable_rx_tx\n");
 
-int 
-stub_status(struct net_device *dev, int phy_addr, u16 *link, u16 *speed)
-{
-       //printk("PHY stub_status\n");
-       *link = 1;
-       /* hmmm, revisit */
-       *speed = IF_PORT_100BASEFX;
-       dev->if_port = IF_PORT_100BASEFX;
-       return 0;
+       reg = readl(&aup->mac->control);
+       reg |= (MAC_RX_ENABLE | MAC_TX_ENABLE);
+       writel(reg, &aup->mac->control);
+       au_sync_delay(10);
 }
-#endif
-
-struct phy_ops bcm_5201_ops = {
-       bcm_5201_init,
-       bcm_5201_reset,
-       bcm_5201_status,
-};
 
-struct phy_ops am79c874_ops = {
-       am79c874_init,
-       am79c874_reset,
-       am79c874_status,
-};
-
-struct phy_ops am79c901_ops = {
-       am79c901_init,
-       am79c901_reset,
-       am79c901_status,
-};
-
-struct phy_ops lsi_80227_ops = { 
-       lsi_80227_init,
-       lsi_80227_reset,
-       lsi_80227_status,
-};
-
-struct phy_ops lxt971a_ops = { 
-       lxt971a_init,
-       lxt971a_reset,
-       lxt971a_status,
-};
+static void
+au1000_adjust_link(struct net_device *dev)
+{
+       struct au1000_private *aup = netdev_priv(dev);
+       struct phy_device *phydev = aup->phy_dev;
+       unsigned long flags;
+       u32 reg;
 
-struct phy_ops ks8995m_ops = {
-       ks8995m_init,
-       ks8995m_reset,
-       ks8995m_status,
-};
+       int status_change = 0;
 
-struct phy_ops smsc_83C185_ops = {
-       smsc_83C185_init,
-       smsc_83C185_reset,
-       smsc_83C185_status,
-};
+       BUG_ON(!aup->phy_dev);
 
-#ifdef CONFIG_MIPS_BOSPORUS
-struct phy_ops stub_ops = {
-       stub_init,
-       stub_reset,
-       stub_status,
-};
-#endif
+       spin_lock_irqsave(&aup->lock, flags);
 
-static struct mii_chip_info {
-       const char * name;
-       u16 phy_id0;
-       u16 phy_id1;
-       struct phy_ops *phy_ops;        
-       int dual_phy;
-} mii_chip_table[] = {
-       {"Broadcom BCM5201 10/100 BaseT PHY",0x0040,0x6212, &bcm_5201_ops,0},
-       {"Broadcom BCM5221 10/100 BaseT PHY",0x0040,0x61e4, &bcm_5201_ops,0},
-       {"Broadcom BCM5222 10/100 BaseT PHY",0x0040,0x6322, &bcm_5201_ops,1},
-       {"NS DP83847 PHY", 0x2000, 0x5c30, &bcm_5201_ops ,0},
-       {"AMD 79C901 HomePNA PHY",0x0000,0x35c8, &am79c901_ops,0},
-       {"AMD 79C874 10/100 BaseT PHY",0x0022,0x561b, &am79c874_ops,0},
-       {"LSI 80227 10/100 BaseT PHY",0x0016,0xf840, &lsi_80227_ops,0},
-       {"Intel LXT971A Dual Speed PHY",0x0013,0x78e2, &lxt971a_ops,0},
-       {"Kendin KS8995M 10/100 BaseT PHY",0x0022,0x1450, &ks8995m_ops,0},
-       {"SMSC LAN83C185 10/100 BaseT PHY",0x0007,0xc0a3, &smsc_83C185_ops,0},
-#ifdef CONFIG_MIPS_BOSPORUS
-       {"Stub", 0x1234, 0x5678, &stub_ops },
-#endif
-       {0,},
-};
+       if (phydev->link && (aup->old_speed != phydev->speed)) {
+               /* speed changed */
 
-static int mdio_read(struct net_device *dev, int phy_id, int reg)
-{
-       struct au1000_private *aup = (struct au1000_private *) dev->priv;
-       volatile u32 *mii_control_reg;
-       volatile u32 *mii_data_reg;
-       u32 timedout = 20;
-       u32 mii_control;
+               switch (phydev->speed) {
+               case SPEED_10:
+               case SPEED_100:
+                       break;
+               default:
+                       netdev_warn(dev, "Speed (%d) is not 10/100 ???\n",
+                                                       phydev->speed);
+                       break;
+               }
 
-       #ifdef CONFIG_BCM5222_DUAL_PHY
-       /* First time we probe, it's for the mac0 phy.
-        * Since we haven't determined yet that we have a dual phy,
-        * aup->mii->mii_control_reg won't be setup and we'll
-        * default to the else statement.
-        * By the time we probe for the mac1 phy, the mii_control_reg
-        * will be setup to be the address of the mac0 phy control since
-        * both phys are controlled through mac0.
-        */
-       if (aup->mii && aup->mii->mii_control_reg) {
-               mii_control_reg = aup->mii->mii_control_reg;
-               mii_data_reg = aup->mii->mii_data_reg;
-       }
-       else if (au_macs[0]->mii && au_macs[0]->mii->mii_control_reg) {
-               /* assume both phys are controlled through mac0 */
-               mii_control_reg = au_macs[0]->mii->mii_control_reg;
-               mii_data_reg = au_macs[0]->mii->mii_data_reg;
-       }
-       else 
-       #endif
-       {
-               /* default control and data reg addresses */
-               mii_control_reg = &aup->mac->mii_control;
-               mii_data_reg = &aup->mac->mii_data;
-       }
+               aup->old_speed = phydev->speed;
 
-       while (*mii_control_reg & MAC_MII_BUSY) {
-               mdelay(1);
-               if (--timedout == 0) {
-                       printk(KERN_ERR "%s: read_MII busy timeout!!\n", 
-                                       dev->name);
-                       return -1;
-               }
+               status_change = 1;
        }
 
-       mii_control = MAC_SET_MII_SELECT_REG(reg) | 
-               MAC_SET_MII_SELECT_PHY(phy_id) | MAC_MII_READ;
+       if (phydev->link && (aup->old_duplex != phydev->duplex)) {
+               /* duplex mode changed */
 
-       *mii_control_reg = mii_control;
+               /* switching duplex mode requires to disable rx and tx! */
+               au1000_hard_stop(dev);
 
-       timedout = 20;
-       while (*mii_control_reg & MAC_MII_BUSY) {
-               mdelay(1);
-               if (--timedout == 0) {
-                       printk(KERN_ERR "%s: mdio_read busy timeout!!\n", 
-                                       dev->name);
-                       return -1;
+               reg = readl(&aup->mac->control);
+               if (DUPLEX_FULL == phydev->duplex) {
+                       reg |= MAC_FULL_DUPLEX;
+                       reg &= ~MAC_DISABLE_RX_OWN;
+               } else {
+                       reg &= ~MAC_FULL_DUPLEX;
+                       reg |= MAC_DISABLE_RX_OWN;
                }
-       }
-       return (int)*mii_data_reg;
-}
+               writel(reg, &aup->mac->control);
+               au_sync_delay(1);
 
-static void mdio_write(struct net_device *dev, int phy_id, int reg, u16 value)
-{
-       struct au1000_private *aup = (struct au1000_private *) dev->priv;
-       volatile u32 *mii_control_reg;
-       volatile u32 *mii_data_reg;
-       u32 timedout = 20;
-       u32 mii_control;
+               au1000_enable_rx_tx(dev);
+               aup->old_duplex = phydev->duplex;
 
-       #ifdef CONFIG_BCM5222_DUAL_PHY
-       if (aup->mii && aup->mii->mii_control_reg) {
-               mii_control_reg = aup->mii->mii_control_reg;
-               mii_data_reg = aup->mii->mii_data_reg;
-       }
-       else if (au_macs[0]->mii && au_macs[0]->mii->mii_control_reg) {
-               /* assume both phys are controlled through mac0 */
-               mii_control_reg = au_macs[0]->mii->mii_control_reg;
-               mii_data_reg = au_macs[0]->mii->mii_data_reg;
-       }
-       else 
-       #endif
-       {
-               /* default control and data reg addresses */
-               mii_control_reg = &aup->mac->mii_control;
-               mii_data_reg = &aup->mac->mii_data;
+               status_change = 1;
        }
 
-       while (*mii_control_reg & MAC_MII_BUSY) {
-               mdelay(1);
-               if (--timedout == 0) {
-                       printk(KERN_ERR "%s: mdio_write busy timeout!!\n", 
-                                       dev->name);
-                       return;
-               }
-       }
+       if (phydev->link != aup->old_link) {
+               /* link state changed */
 
-       mii_control = MAC_SET_MII_SELECT_REG(reg) | 
-               MAC_SET_MII_SELECT_PHY(phy_id) | MAC_MII_WRITE;
-
-       *mii_data_reg = value;
-       *mii_control_reg = mii_control;
-}
+               if (!phydev->link) {
+                       /* link went down */
+                       aup->old_speed = 0;
+                       aup->old_duplex = -1;
+               }
 
+               aup->old_link = phydev->link;
+               status_change = 1;
+       }
 
-static void dump_mii(struct net_device *dev, int phy_id)
-{
-       int i, val;
+       spin_unlock_irqrestore(&aup->lock, flags);
 
-       for (i = 0; i < 7; i++) {
-               if ((val = mdio_read(dev, phy_id, i)) >= 0)
-                       printk("%s: MII Reg %d=%x\n", dev->name, i, val);
-       }
-       for (i = 16; i < 25; i++) {
-               if ((val = mdio_read(dev, phy_id, i)) >= 0)
-                       printk("%s: MII Reg %d=%x\n", dev->name, i, val);
+       if (status_change) {
+               if (phydev->link)
+                       netdev_info(dev, "link up (%d/%s)\n",
+                              phydev->speed,
+                              DUPLEX_FULL == phydev->duplex ? "Full" : "Half");
+               else
+                       netdev_info(dev, "link down\n");
        }
 }
 
-static int mii_probe (struct net_device * dev)
+static int au1000_mii_probe(struct net_device *dev)
 {
-       struct au1000_private *aup = (struct au1000_private *) dev->priv;
+       struct au1000_private *const aup = netdev_priv(dev);
+       struct phy_device *phydev = NULL;
        int phy_addr;
-#ifdef CONFIG_MIPS_BOSPORUS
-       int phy_found=0;
-#endif
 
-       /* search for total of 32 possible mii phy addresses */
-       for (phy_addr = 0; phy_addr < 32; phy_addr++) {
-               u16 mii_status;
-               u16 phy_id0, phy_id1;
-               int i;
+       if (aup->phy_static_config) {
+               BUG_ON(aup->mac_id < 0 || aup->mac_id > 1);
 
-               #ifdef CONFIG_BCM5222_DUAL_PHY
-               /* Mask the already found phy, try next one */
-               if (au_macs[0]->mii && au_macs[0]->mii->mii_control_reg) {
-                       if (au_macs[0]->phy_addr == phy_addr)
-                               continue;
-               }
-               #endif
-
-               mii_status = mdio_read(dev, phy_addr, MII_STATUS);
-               if (mii_status == 0xffff || mii_status == 0x0000)
-                       /* the mii is not accessable, try next one */
-                       continue;
-
-               phy_id0 = mdio_read(dev, phy_addr, MII_PHY_ID0);
-               phy_id1 = mdio_read(dev, phy_addr, MII_PHY_ID1);
-
-               /* search our mii table for the current mii */ 
-               for (i = 0; mii_chip_table[i].phy_id1; i++) {
-                       if (phy_id0 == mii_chip_table[i].phy_id0 &&
-                           phy_id1 == mii_chip_table[i].phy_id1) {
-                               struct mii_phy * mii_phy = aup->mii;
-
-                               printk(KERN_INFO "%s: %s at phy address %d\n",
-                                      dev->name, mii_chip_table[i].name, 
-                                      phy_addr);
-#ifdef CONFIG_MIPS_BOSPORUS
-                               phy_found = 1;
-#endif
-                               mii_phy->chip_info = mii_chip_table+i;
-                               aup->phy_addr = phy_addr;
-                               aup->want_autoneg = 1;
-                               aup->phy_ops = mii_chip_table[i].phy_ops;
-                               aup->phy_ops->phy_init(dev,phy_addr);
-
-                               // Check for dual-phy and then store required 
-                               // values and set indicators. We need to do 
-                               // this now since mdio_{read,write} need the 
-                               // control and data register addresses.
-                               #ifdef CONFIG_BCM5222_DUAL_PHY
-                               if ( mii_chip_table[i].dual_phy) {
-
-                                       /* assume both phys are controlled 
-                                        * through MAC0. Board specific? */
-                                       
-                                       /* sanity check */
-                                       if (!au_macs[0] || !au_macs[0]->mii)
-                                               return -1;
-                                       aup->mii->mii_control_reg = (u32 *)
-                                               &au_macs[0]->mac->mii_control;
-                                       aup->mii->mii_data_reg = (u32 *)
-                                               &au_macs[0]->mac->mii_data;
-                               }
-                               #endif
-                               goto found;
-                       }
-               }
+               if (aup->phy_addr)
+                       phydev = aup->mii_bus->phy_map[aup->phy_addr];
+               else
+                       netdev_info(dev, "using PHY-less setup\n");
+               return 0;
        }
-found:
-
-#ifdef CONFIG_MIPS_BOSPORUS
-       /* This is a workaround for the Micrel/Kendin 5 port switch
-          The second MAC doesn't see a PHY connected... so we need to
-          trick it into thinking we have one.
-               
-          If this kernel is run on another Au1500 development board
-          the stub will be found as well as the actual PHY. However,
-          the last found PHY will be used... usually at Addr 31 (Db1500).      
-       */
-       if ( (!phy_found) )
-       {
-               u16 phy_id0, phy_id1;
-               int i;
-
-               phy_id0 = 0x1234;
-               phy_id1 = 0x5678;
-
-               /* search our mii table for the current mii */ 
-               for (i = 0; mii_chip_table[i].phy_id1; i++) {
-                       if (phy_id0 == mii_chip_table[i].phy_id0 &&
-                           phy_id1 == mii_chip_table[i].phy_id1) {
-                               struct mii_phy * mii_phy;
-
-                               printk(KERN_INFO "%s: %s at phy address %d\n",
-                                      dev->name, mii_chip_table[i].name, 
-                                      phy_addr);
-                               mii_phy = kmalloc(sizeof(struct mii_phy), 
-                                               GFP_KERNEL);
-                               if (mii_phy) {
-                                       mii_phy->chip_info = mii_chip_table+i;
-                                       aup->phy_addr = phy_addr;
-                                       mii_phy->next = aup->mii;
-                                       aup->phy_ops = 
-                                               mii_chip_table[i].phy_ops;
-                                       aup->mii = mii_phy;
-                                       aup->phy_ops->phy_init(dev,phy_addr);
-                               } else {
-                                       printk(KERN_ERR "%s: out of memory\n", 
-                                                       dev->name);
-                                       return -1;
-                               }
-                               mii_phy->chip_info = mii_chip_table+i;
-                               aup->phy_addr = phy_addr;
-                               aup->phy_ops = mii_chip_table[i].phy_ops;
-                               aup->phy_ops->phy_init(dev,phy_addr);
+
+       /* find the first (lowest address) PHY
+        * on the current MAC's MII bus
+        */
+       for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++)
+               if (aup->mii_bus->phy_map[phy_addr]) {
+                       phydev = aup->mii_bus->phy_map[phy_addr];
+                       if (!aup->phy_search_highest_addr)
+                               /* break out with first one found */
                                break;
+               }
+
+       if (aup->phy1_search_mac0) {
+               /* try harder to find a PHY */
+               if (!phydev && (aup->mac_id == 1)) {
+                       /* no PHY found, maybe we have a dual PHY? */
+                       dev_info(&dev->dev, ": no PHY found on MAC1, "
+                               "let's see if it's attached to MAC0...\n");
+
+                       /* find the first (lowest address) non-attached
+                        * PHY on the MAC0 MII bus
+                        */
+                       for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++) {
+                               struct phy_device *const tmp_phydev =
+                                       aup->mii_bus->phy_map[phy_addr];
+
+                               if (aup->mac_id == 1)
+                                       break;
+
+                               /* no PHY here... */
+                               if (!tmp_phydev)
+                                       continue;
+
+                               /* already claimed by MAC0 */
+                               if (tmp_phydev->attached_dev)
+                                       continue;
+
+                               phydev = tmp_phydev;
+                               break; /* found it */
                        }
                }
        }
-       if (aup->mac_id == 0) {
-               /* the Bosporus phy responds to addresses 0-5 but 
-                * 5 is the correct one.
-                */
-               aup->phy_addr = 5;
-       }
-#endif
 
-       if (aup->mii->chip_info == NULL) {
-               printk(KERN_ERR "%s: Au1x No known MII transceivers found!\n",
-                               dev->name);
+       if (!phydev) {
+               netdev_err(dev, "no PHY found\n");
                return -1;
        }
 
-       printk(KERN_INFO "%s: Using %s as default\n", 
-                       dev->name, aup->mii->chip_info->name);
+       /* now we are supposed to have a proper phydev, to attach to... */
+       BUG_ON(phydev->attached_dev);
+
+       phydev = phy_connect(dev, dev_name(&phydev->dev), &au1000_adjust_link,
+                       0, PHY_INTERFACE_MODE_MII);
+
+       if (IS_ERR(phydev)) {
+               netdev_err(dev, "Could not attach to PHY\n");
+               return PTR_ERR(phydev);
+       }
+
+       /* mask with MAC supported features */
+       phydev->supported &= (SUPPORTED_10baseT_Half
+                             | SUPPORTED_10baseT_Full
+                             | SUPPORTED_100baseT_Half
+                             | SUPPORTED_100baseT_Full
+                             | SUPPORTED_Autoneg
+                             /* | SUPPORTED_Pause | SUPPORTED_Asym_Pause */
+                             | SUPPORTED_MII
+                             | SUPPORTED_TP);
+
+       phydev->advertising = phydev->supported;
+
+       aup->old_link = 0;
+       aup->old_speed = 0;
+       aup->old_duplex = -1;
+       aup->phy_dev = phydev;
+
+       netdev_info(dev, "attached PHY driver [%s] "
+              "(mii_bus:phy_addr=%s, irq=%d)\n",
+              phydev->drv->name, dev_name(&phydev->dev), phydev->irq);
 
        return 0;
 }
@@ -1054,79 +472,40 @@ found:
 
 /*
  * Buffer allocation/deallocation routines. The buffer descriptor returned
- * has the virtual and dma address of a buffer suitable for 
+ * has the virtual and dma address of a buffer suitable for
  * both, receive and transmit operations.
  */
-static db_dest_t *GetFreeDB(struct au1000_private *aup)
+static struct db_dest *au1000_GetFreeDB(struct au1000_private *aup)
 {
-       db_dest_t *pDB;
+       struct db_dest *pDB;
        pDB = aup->pDBfree;
 
-       if (pDB) {
+       if (pDB)
                aup->pDBfree = pDB->pnext;
-       }
+
        return pDB;
 }
 
-void ReleaseDB(struct au1000_private *aup, db_dest_t *pDB)
+void au1000_ReleaseDB(struct au1000_private *aup, struct db_dest *pDB)
 {
-       db_dest_t *pDBfree = aup->pDBfree;
+       struct db_dest *pDBfree = aup->pDBfree;
        if (pDBfree)
                pDBfree->pnext = pDB;
        aup->pDBfree = pDB;
 }
 
-static void enable_rx_tx(struct net_device *dev)
-{
-       struct au1000_private *aup = (struct au1000_private *) dev->priv;
-
-       if (au1000_debug > 4)
-               printk(KERN_INFO "%s: enable_rx_tx\n", dev->name);
-
-       aup->mac->control |= (MAC_RX_ENABLE | MAC_TX_ENABLE);
-       au_sync_delay(10);
-}
-
-static void hard_stop(struct net_device *dev)
-{
-       struct au1000_private *aup = (struct au1000_private *) dev->priv;
-
-       if (au1000_debug > 4)
-               printk(KERN_INFO "%s: hard stop\n", dev->name);
-
-       aup->mac->control &= ~(MAC_RX_ENABLE | MAC_TX_ENABLE);
-       au_sync_delay(10);
-}
-
-
-static void reset_mac(struct net_device *dev)
+static void au1000_reset_mac_unlocked(struct net_device *dev)
 {
+       struct au1000_private *const aup = netdev_priv(dev);
        int i;
-       u32 flags;
-       struct au1000_private *aup = (struct au1000_private *) dev->priv;
 
-       if (au1000_debug > 4) 
-               printk(KERN_INFO "%s: reset mac, aup %x\n", 
-                               dev->name, (unsigned)aup);
+       au1000_hard_stop(dev);
 
-       spin_lock_irqsave(&aup->lock, flags);
-       if (aup->timer.function == &au1000_timer) {/* check if timer initted */
-               del_timer(&aup->timer);
-       }
+       writel(MAC_EN_CLOCK_ENABLE, aup->enable);
+       au_sync_delay(2);
+       writel(0, aup->enable);
+       au_sync_delay(2);
 
-       hard_stop(dev);
-       #ifdef CONFIG_BCM5222_DUAL_PHY
-       if (aup->mac_id != 0) {
-       #endif
-               /* If BCM5222, we can't leave MAC0 in reset because then 
-                * we can't access the dual phy for ETH1 */
-               *aup->enable = MAC_EN_CLOCK_ENABLE;
-               au_sync_delay(2);
-               *aup->enable = 0;
-               au_sync_delay(2);
-       #ifdef CONFIG_BCM5222_DUAL_PHY
-       }
-       #endif
        aup->tx_full = 0;
        for (i = 0; i < NUM_RX_DMA; i++) {
                /* reset control bits */
@@ -1136,286 +515,79 @@ static void reset_mac(struct net_device *dev)
                /* reset control bits */
                aup->tx_dma_ring[i]->buff_stat &= ~0xf;
        }
-       spin_unlock_irqrestore(&aup->lock, flags);
+
+       aup->mac_enabled = 0;
+
 }
 
+static void au1000_reset_mac(struct net_device *dev)
+{
+       struct au1000_private *const aup = netdev_priv(dev);
+       unsigned long flags;
+
+       netif_dbg(aup, hw, dev, "reset mac, aup %x\n",
+                                       (unsigned)aup);
 
-/* 
+       spin_lock_irqsave(&aup->lock, flags);
+
+       au1000_reset_mac_unlocked(dev);
+
+       spin_unlock_irqrestore(&aup->lock, flags);
+}
+
+/*
  * Setup the receive and transmit "rings".  These pointers are the addresses
  * of the rx and tx MAC DMA registers so they are fixed by the hardware --
  * these are not descriptors sitting in memory.
  */
-static void 
-setup_hw_rings(struct au1000_private *aup, u32 rx_base, u32 tx_base)
+static void
+au1000_setup_hw_rings(struct au1000_private *aup, u32 rx_base, u32 tx_base)
 {
        int i;
 
        for (i = 0; i < NUM_RX_DMA; i++) {
-               aup->rx_dma_ring[i] = 
-                       (volatile rx_dma_t *) (rx_base + sizeof(rx_dma_t)*i);
+               aup->rx_dma_ring[i] =
+                       (struct rx_dma *)
+                                       (rx_base + sizeof(struct rx_dma)*i);
        }
        for (i = 0; i < NUM_TX_DMA; i++) {
-               aup->tx_dma_ring[i] = 
-                       (volatile tx_dma_t *) (tx_base + sizeof(tx_dma_t)*i);
+               aup->tx_dma_ring[i] =
+                       (struct tx_dma *)
+                                       (tx_base + sizeof(struct tx_dma)*i);
        }
 }
 
-static struct {
-       int port;
-       u32 base_addr;
-       u32 macen_addr;
-       int irq;
-       struct net_device *dev;
-} iflist[2];
-
-static int num_ifs;
-
 /*
- * Setup the base address and interupt of the Au1xxx ethernet macs
- * based on cpu type and whether the interface is enabled in sys_pinfunc
- * register. The last interface is enabled if SYS_PF_NI2 (bit 4) is 0.
+ * ethtool operations
  */
-static int __init au1000_init_module(void)
-{
-       struct cpuinfo_mips *c = &current_cpu_data;
-       int ni = (int)((au_readl(SYS_PINFUNC) & (u32)(SYS_PF_NI2)) >> 4);
-       struct net_device *dev;
-       int i, found_one = 0;
-
-       switch (c->cputype) {
-#ifdef CONFIG_SOC_AU1000
-       case CPU_AU1000:
-               num_ifs = 2 - ni;
-               iflist[0].base_addr = AU1000_ETH0_BASE;
-               iflist[1].base_addr = AU1000_ETH1_BASE;
-               iflist[0].macen_addr = AU1000_MAC0_ENABLE;
-               iflist[1].macen_addr = AU1000_MAC1_ENABLE;
-               iflist[0].irq = AU1000_MAC0_DMA_INT;
-               iflist[1].irq = AU1000_MAC1_DMA_INT;
-               break;
-#endif
-#ifdef CONFIG_SOC_AU1100
-       case CPU_AU1100:
-               num_ifs = 1 - ni;
-               iflist[0].base_addr = AU1100_ETH0_BASE;
-               iflist[0].macen_addr = AU1100_MAC0_ENABLE;
-               iflist[0].irq = AU1100_MAC0_DMA_INT;
-               break;
-#endif
-#ifdef CONFIG_SOC_AU1500
-       case CPU_AU1500:
-               num_ifs = 2 - ni;
-               iflist[0].base_addr = AU1500_ETH0_BASE;
-               iflist[1].base_addr = AU1500_ETH1_BASE;
-               iflist[0].macen_addr = AU1500_MAC0_ENABLE;
-               iflist[1].macen_addr = AU1500_MAC1_ENABLE;
-               iflist[0].irq = AU1500_MAC0_DMA_INT;
-               iflist[1].irq = AU1500_MAC1_DMA_INT;
-               break;
-#endif
-#ifdef CONFIG_SOC_AU1550
-       case CPU_AU1550:
-               num_ifs = 2 - ni;
-               iflist[0].base_addr = AU1550_ETH0_BASE;
-               iflist[1].base_addr = AU1550_ETH1_BASE;
-               iflist[0].macen_addr = AU1550_MAC0_ENABLE;
-               iflist[1].macen_addr = AU1550_MAC1_ENABLE;
-               iflist[0].irq = AU1550_MAC0_DMA_INT;
-               iflist[1].irq = AU1550_MAC1_DMA_INT;
-               break;
-#endif
-       default:
-               num_ifs = 0;
-       }
-       for(i = 0; i < num_ifs; i++) {
-               dev = au1000_probe(iflist[i].base_addr, iflist[i].irq, i);
-               iflist[i].dev = dev;
-               if (dev)
-                       found_one++;
-       }
-       if (!found_one)
-               return -ENODEV;
-       return 0;
-}
 
-static int au1000_setup_aneg(struct net_device *dev, u32 advertise)
-{
-       struct au1000_private *aup = (struct au1000_private *)dev->priv;
-       u16 ctl, adv;
-
-       /* Setup standard advertise */
-       adv = mdio_read(dev, aup->phy_addr, MII_ADVERTISE);
-       adv &= ~(ADVERTISE_ALL | ADVERTISE_100BASE4);
-       if (advertise & ADVERTISED_10baseT_Half)
-               adv |= ADVERTISE_10HALF;
-       if (advertise & ADVERTISED_10baseT_Full)
-               adv |= ADVERTISE_10FULL;
-       if (advertise & ADVERTISED_100baseT_Half)
-               adv |= ADVERTISE_100HALF;
-       if (advertise & ADVERTISED_100baseT_Full)
-               adv |= ADVERTISE_100FULL;
-       mdio_write(dev, aup->phy_addr, MII_ADVERTISE, adv);
-
-       /* Start/Restart aneg */
-       ctl = mdio_read(dev, aup->phy_addr, MII_BMCR);
-       ctl |= (BMCR_ANENABLE | BMCR_ANRESTART);
-       mdio_write(dev, aup->phy_addr, MII_BMCR, ctl);
-
-       return 0;
-}
-
-static int au1000_setup_forced(struct net_device *dev, int speed, int fd)
-{
-       struct au1000_private *aup = (struct au1000_private *)dev->priv;
-       u16 ctl;
-
-       ctl = mdio_read(dev, aup->phy_addr, MII_BMCR);
-       ctl &= ~(BMCR_FULLDPLX | BMCR_SPEED100 | BMCR_ANENABLE);
-
-       /* First reset the PHY */
-       mdio_write(dev, aup->phy_addr, MII_BMCR, ctl | BMCR_RESET);
-
-       /* Select speed & duplex */
-       switch (speed) {
-               case SPEED_10:
-                       break;
-               case SPEED_100:
-                       ctl |= BMCR_SPEED100;
-                       break;
-               case SPEED_1000:
-               default:
-                       return -EINVAL;
-       }
-       if (fd == DUPLEX_FULL)
-               ctl |= BMCR_FULLDPLX;
-       mdio_write(dev, aup->phy_addr, MII_BMCR, ctl);
-
-       return 0;
-}
-
-
-static void
-au1000_start_link(struct net_device *dev, struct ethtool_cmd *cmd)
+static int au1000_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
-       struct au1000_private *aup = (struct au1000_private *)dev->priv;
-       u32 advertise;
-       int autoneg;
-       int forced_speed;
-       int forced_duplex;
-
-       /* Default advertise */
-       advertise = GENMII_DEFAULT_ADVERTISE;
-       autoneg = aup->want_autoneg;
-       forced_speed = SPEED_100;
-       forced_duplex = DUPLEX_FULL;
-
-       /* Setup link parameters */
-       if (cmd) {
-               if (cmd->autoneg == AUTONEG_ENABLE) {
-                       advertise = cmd->advertising;
-                       autoneg = 1;
-               } else {
-                       autoneg = 0;
-
-                       forced_speed = cmd->speed;
-                       forced_duplex = cmd->duplex;
-               }
-       }
+       struct au1000_private *aup = netdev_priv(dev);
 
-       /* Configure PHY & start aneg */
-       aup->want_autoneg = autoneg;
-       if (autoneg)
-               au1000_setup_aneg(dev, advertise);
-       else
-               au1000_setup_forced(dev, forced_speed, forced_duplex);
-       mod_timer(&aup->timer, jiffies + HZ);
-}
+       if (aup->phy_dev)
+               return phy_ethtool_gset(aup->phy_dev, cmd);
 
-static int au1000_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
-       struct au1000_private *aup = (struct au1000_private *)dev->priv;
-       u16 link, speed;
-
-       cmd->supported = GENMII_DEFAULT_FEATURES;
-       cmd->advertising = GENMII_DEFAULT_ADVERTISE;
-       cmd->port = PORT_MII;
-       cmd->transceiver = XCVR_EXTERNAL;
-       cmd->phy_address = aup->phy_addr;
-       spin_lock_irq(&aup->lock);
-       cmd->autoneg = aup->want_autoneg;
-       aup->phy_ops->phy_status(dev, aup->phy_addr, &link, &speed);
-       if ((speed == IF_PORT_100BASETX) || (speed == IF_PORT_100BASEFX))
-               cmd->speed = SPEED_100;
-       else if (speed == IF_PORT_10BASET)
-               cmd->speed = SPEED_10;
-       if (link && (dev->if_port == IF_PORT_100BASEFX))
-               cmd->duplex = DUPLEX_FULL;
-       else
-               cmd->duplex = DUPLEX_HALF;
-       spin_unlock_irq(&aup->lock);
-       return 0;
+       return -EINVAL;
 }
 
 static int au1000_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
-        struct au1000_private *aup = (struct au1000_private *)dev->priv;
-         unsigned long features = GENMII_DEFAULT_FEATURES;
-
-        if (!capable(CAP_NET_ADMIN))
-                return -EPERM;
-
-        if (cmd->autoneg != AUTONEG_ENABLE && cmd->autoneg != AUTONEG_DISABLE)
-                return -EINVAL;
-        if (cmd->autoneg == AUTONEG_ENABLE && cmd->advertising == 0)
-                return -EINVAL;
-        if (cmd->duplex != DUPLEX_HALF && cmd->duplex != DUPLEX_FULL)
-                return -EINVAL;
-        if (cmd->autoneg == AUTONEG_DISABLE)
-                switch (cmd->speed) {
-                case SPEED_10:
-                        if (cmd->duplex == DUPLEX_HALF &&
-                                (features & SUPPORTED_10baseT_Half) == 0)
-                                return -EINVAL;
-                        if (cmd->duplex == DUPLEX_FULL &&
-                                (features & SUPPORTED_10baseT_Full) == 0)
-                                return -EINVAL;
-                        break;
-                case SPEED_100:
-                        if (cmd->duplex == DUPLEX_HALF &&
-                                (features & SUPPORTED_100baseT_Half) == 0)
-                                return -EINVAL;
-                        if (cmd->duplex == DUPLEX_FULL &&
-                                (features & SUPPORTED_100baseT_Full) == 0)
-                                return -EINVAL;
-                        break;
-                default:
-                        return -EINVAL;
-                }
-        else if ((features & SUPPORTED_Autoneg) == 0)
-                return -EINVAL;
-
-        spin_lock_irq(&aup->lock);
-        au1000_start_link(dev, cmd);
-        spin_unlock_irq(&aup->lock);
-        return 0;
-}
+       struct au1000_private *aup = netdev_priv(dev);
 
-static int au1000_nway_reset(struct net_device *dev)
-{
-       struct au1000_private *aup = (struct au1000_private *)dev->priv;
+       if (!capable(CAP_NET_ADMIN))
+               return -EPERM;
 
-       if (!aup->want_autoneg)
-               return -EINVAL;
-       spin_lock_irq(&aup->lock);
-       au1000_start_link(dev, NULL);
-       spin_unlock_irq(&aup->lock);
-       return 0;
+       if (aup->phy_dev)
+               return phy_ethtool_sset(aup->phy_dev, cmd);
+
+       return -EINVAL;
 }
 
 static void
 au1000_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
 {
-       struct au1000_private *aup = (struct au1000_private *)dev->priv;
+       struct au1000_private *aup = netdev_priv(dev);
 
        strcpy(info->driver, DRV_NAME);
        strcpy(info->version, DRV_VERSION);
@@ -1424,209 +596,29 @@ au1000_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
        info->regdump_len = 0;
 }
 
-static u32 au1000_get_link(struct net_device *dev)
+static void au1000_set_msglevel(struct net_device *dev, u32 value)
+{
+       struct au1000_private *aup = netdev_priv(dev);
+       aup->msg_enable = value;
+}
+
+static u32 au1000_get_msglevel(struct net_device *dev)
 {
-       return netif_carrier_ok(dev);
+       struct au1000_private *aup = netdev_priv(dev);
+       return aup->msg_enable;
 }
 
-static struct ethtool_ops au1000_ethtool_ops = {
+static const struct ethtool_ops au1000_ethtool_ops = {
        .get_settings = au1000_get_settings,
        .set_settings = au1000_set_settings,
        .get_drvinfo = au1000_get_drvinfo,
-       .nway_reset = au1000_nway_reset,
-       .get_link = au1000_get_link
+       .get_link = ethtool_op_get_link,
+       .get_msglevel = au1000_get_msglevel,
+       .set_msglevel = au1000_set_msglevel,
 };
 
-static struct net_device *
-au1000_probe(u32 ioaddr, int irq, int port_num)
-{
-       static unsigned version_printed = 0;
-       struct au1000_private *aup = NULL;
-       struct net_device *dev = NULL;
-       db_dest_t *pDB, *pDBfree;
-       char *pmac, *argptr;
-       char ethaddr[6];
-       int i, err;
-
-       if (!request_mem_region(CPHYSADDR(ioaddr), MAC_IOSIZE, "Au1x00 ENET"))
-               return NULL;
-
-       if (version_printed++ == 0) 
-               printk("%s version %s %s\n", DRV_NAME, DRV_VERSION, DRV_AUTHOR);
-
-       dev = alloc_etherdev(sizeof(struct au1000_private));
-       if (!dev) {
-               printk (KERN_ERR "au1000 eth: alloc_etherdev failed\n");  
-               return NULL;
-       }
-
-       if ((err = register_netdev(dev))) {
-               printk(KERN_ERR "Au1x_eth Cannot register net device err %d\n",
-                               err);
-               free_netdev(dev);
-               return NULL;
-       }
-
-       printk("%s: Au1x Ethernet found at 0x%x, irq %d\n", 
-                       dev->name, ioaddr, irq);
-
-       aup = dev->priv;
 
-       /* Allocate the data buffers */
-       /* Snooping works fine with eth on all au1xxx */
-       aup->vaddr = (u32)dma_alloc_noncoherent(NULL,
-                       MAX_BUF_SIZE * (NUM_TX_BUFFS+NUM_RX_BUFFS),
-                       &aup->dma_addr,
-                       0);
-       if (!aup->vaddr) {
-               free_netdev(dev);
-               release_mem_region(CPHYSADDR(ioaddr), MAC_IOSIZE);
-               return NULL;
-       }
-
-       /* aup->mac is the base address of the MAC's registers */
-       aup->mac = (volatile mac_reg_t *)((unsigned long)ioaddr);
-       /* Setup some variables for quick register address access */
-       if (ioaddr == iflist[0].base_addr)
-       {
-               /* check env variables first */
-               if (!get_ethernet_addr(ethaddr)) { 
-                       memcpy(au1000_mac_addr, ethaddr, sizeof(au1000_mac_addr));
-               } else {
-                       /* Check command line */
-                       argptr = prom_getcmdline();
-                       if ((pmac = strstr(argptr, "ethaddr=")) == NULL) {
-                               printk(KERN_INFO "%s: No mac address found\n", 
-                                               dev->name);
-                               /* use the hard coded mac addresses */
-                       } else {
-                               str2eaddr(ethaddr, pmac + strlen("ethaddr="));
-                               memcpy(au1000_mac_addr, ethaddr, 
-                                               sizeof(au1000_mac_addr));
-                       }
-               }
-                       aup->enable = (volatile u32 *) 
-                               ((unsigned long)iflist[0].macen_addr);
-               memcpy(dev->dev_addr, au1000_mac_addr, sizeof(au1000_mac_addr));
-               setup_hw_rings(aup, MAC0_RX_DMA_ADDR, MAC0_TX_DMA_ADDR);
-               aup->mac_id = 0;
-               au_macs[0] = aup;
-       }
-               else
-       if (ioaddr == iflist[1].base_addr)
-       {
-                       aup->enable = (volatile u32 *) 
-                               ((unsigned long)iflist[1].macen_addr);
-               memcpy(dev->dev_addr, au1000_mac_addr, sizeof(au1000_mac_addr));
-               dev->dev_addr[4] += 0x10;
-               setup_hw_rings(aup, MAC1_RX_DMA_ADDR, MAC1_TX_DMA_ADDR);
-               aup->mac_id = 1;
-               au_macs[1] = aup;
-       }
-       else
-       {
-               printk(KERN_ERR "%s: bad ioaddr\n", dev->name);
-       }
-
-       /* bring the device out of reset, otherwise probing the mii
-        * will hang */
-       *aup->enable = MAC_EN_CLOCK_ENABLE;
-       au_sync_delay(2);
-       *aup->enable = MAC_EN_RESET0 | MAC_EN_RESET1 | 
-               MAC_EN_RESET2 | MAC_EN_CLOCK_ENABLE;
-       au_sync_delay(2);
-
-       aup->mii = kmalloc(sizeof(struct mii_phy), GFP_KERNEL);
-       if (!aup->mii) {
-               printk(KERN_ERR "%s: out of memory\n", dev->name);
-               goto err_out;
-       }
-       aup->mii->next = NULL;
-       aup->mii->chip_info = NULL;
-       aup->mii->status = 0;
-       aup->mii->mii_control_reg = 0;
-       aup->mii->mii_data_reg = 0;
-
-       if (mii_probe(dev) != 0) {
-               goto err_out;
-       }
-
-       pDBfree = NULL;
-       /* setup the data buffer descriptors and attach a buffer to each one */
-       pDB = aup->db;
-       for (i = 0; i < (NUM_TX_BUFFS+NUM_RX_BUFFS); i++) {
-               pDB->pnext = pDBfree;
-               pDBfree = pDB;
-               pDB->vaddr = (u32 *)((unsigned)aup->vaddr + MAX_BUF_SIZE*i);
-               pDB->dma_addr = (dma_addr_t)virt_to_bus(pDB->vaddr);
-               pDB++;
-       }
-       aup->pDBfree = pDBfree;
-
-       for (i = 0; i < NUM_RX_DMA; i++) {
-               pDB = GetFreeDB(aup);
-               if (!pDB) {
-                       goto err_out;
-               }
-               aup->rx_dma_ring[i]->buff_stat = (unsigned)pDB->dma_addr;
-               aup->rx_db_inuse[i] = pDB;
-       }
-       for (i = 0; i < NUM_TX_DMA; i++) {
-               pDB = GetFreeDB(aup);
-               if (!pDB) {
-                       goto err_out;
-               }
-               aup->tx_dma_ring[i]->buff_stat = (unsigned)pDB->dma_addr;
-               aup->tx_dma_ring[i]->len = 0;
-               aup->tx_db_inuse[i] = pDB;
-       }
-
-       spin_lock_init(&aup->lock);
-       dev->base_addr = ioaddr;
-       dev->irq = irq;
-       dev->open = au1000_open;
-       dev->hard_start_xmit = au1000_tx;
-       dev->stop = au1000_close;
-       dev->get_stats = au1000_get_stats;
-       dev->set_multicast_list = &set_rx_mode;
-       dev->do_ioctl = &au1000_ioctl;
-       SET_ETHTOOL_OPS(dev, &au1000_ethtool_ops);
-       dev->set_config = &au1000_set_config;
-       dev->tx_timeout = au1000_tx_timeout;
-       dev->watchdog_timeo = ETH_TX_TIMEOUT;
-
-       /* 
-        * The boot code uses the ethernet controller, so reset it to start 
-        * fresh.  au1000_init() expects that the device is in reset state.
-        */
-       reset_mac(dev);
-
-       return dev;
-
-err_out:
-       /* here we should have a valid dev plus aup-> register addresses
-        * so we can reset the mac properly.*/
-       reset_mac(dev);
-       kfree(aup->mii);
-       for (i = 0; i < NUM_RX_DMA; i++) {
-               if (aup->rx_db_inuse[i])
-                       ReleaseDB(aup, aup->rx_db_inuse[i]);
-       }
-       for (i = 0; i < NUM_TX_DMA; i++) {
-               if (aup->tx_db_inuse[i])
-                       ReleaseDB(aup, aup->tx_db_inuse[i]);
-       }
-       dma_free_noncoherent(NULL,
-                       MAX_BUF_SIZE * (NUM_TX_BUFFS+NUM_RX_BUFFS),
-                       (void *)aup->vaddr,
-                       aup->dma_addr);
-       unregister_netdev(dev);
-       free_netdev(dev);
-       release_mem_region(CPHYSADDR(ioaddr), MAC_IOSIZE);
-       return NULL;
-}
-
-/* 
+/*
  * Initialize the interface.
  *
  * When the device powers up, the clocks are disabled and the
@@ -1637,214 +629,166 @@ err_out:
  */
 static int au1000_init(struct net_device *dev)
 {
-       struct au1000_private *aup = (struct au1000_private *) dev->priv;
-       u32 flags;
+       struct au1000_private *aup = netdev_priv(dev);
+       unsigned long flags;
        int i;
        u32 control;
-       u16 link, speed;
 
-       if (au1000_debug > 4) 
-               printk("%s: au1000_init\n", dev->name);
-
-       spin_lock_irqsave(&aup->lock, flags);
+       netif_dbg(aup, hw, dev, "au1000_init\n");
 
        /* bring the device out of reset */
-       *aup->enable = MAC_EN_CLOCK_ENABLE;
-        au_sync_delay(2);
-       *aup->enable = MAC_EN_RESET0 | MAC_EN_RESET1 | 
-               MAC_EN_RESET2 | MAC_EN_CLOCK_ENABLE;
-       au_sync_delay(20);
+       au1000_enable_mac(dev, 1);
+
+       spin_lock_irqsave(&aup->lock, flags);
 
-       aup->mac->control = 0;
+       writel(0, &aup->mac->control);
        aup->tx_head = (aup->tx_dma_ring[0]->buff_stat & 0xC) >> 2;
        aup->tx_tail = aup->tx_head;
        aup->rx_head = (aup->rx_dma_ring[0]->buff_stat & 0xC) >> 2;
 
-       aup->mac->mac_addr_high = dev->dev_addr[5]<<8 | dev->dev_addr[4];
-       aup->mac->mac_addr_low = dev->dev_addr[3]<<24 | dev->dev_addr[2]<<16 |
-               dev->dev_addr[1]<<8 | dev->dev_addr[0];
+       writel(dev->dev_addr[5]<<8 | dev->dev_addr[4],
+                                       &aup->mac->mac_addr_high);
+       writel(dev->dev_addr[3]<<24 | dev->dev_addr[2]<<16 |
+               dev->dev_addr[1]<<8 | dev->dev_addr[0],
+                                       &aup->mac->mac_addr_low);
 
-       for (i = 0; i < NUM_RX_DMA; i++) {
+
+       for (i = 0; i < NUM_RX_DMA; i++)
                aup->rx_dma_ring[i]->buff_stat |= RX_DMA_ENABLE;
-       }
+
        au_sync();
 
-       aup->phy_ops->phy_status(dev, aup->phy_addr, &link, &speed);
-       control = MAC_DISABLE_RX_OWN | MAC_RX_ENABLE | MAC_TX_ENABLE;
+       control = MAC_RX_ENABLE | MAC_TX_ENABLE;
 #ifndef CONFIG_CPU_LITTLE_ENDIAN
        control |= MAC_BIG_ENDIAN;
 #endif
-       if (link && (dev->if_port == IF_PORT_100BASEFX)) {
+       if (aup->phy_dev) {
+               if (aup->phy_dev->link && (DUPLEX_FULL == aup->phy_dev->duplex))
+                       control |= MAC_FULL_DUPLEX;
+               else
+                       control |= MAC_DISABLE_RX_OWN;
+       } else { /* PHY-less op, assume full-duplex */
                control |= MAC_FULL_DUPLEX;
        }
 
-       aup->mac->control = control;
-       aup->mac->vlan1_tag = 0x8100; /* activate vlan support */
+       writel(control, &aup->mac->control);
+       writel(0x8100, &aup->mac->vlan1_tag); /* activate vlan support */
        au_sync();
 
        spin_unlock_irqrestore(&aup->lock, flags);
        return 0;
 }
 
-static void au1000_timer(unsigned long data)
-{
-       struct net_device *dev = (struct net_device *)data;
-       struct au1000_private *aup = (struct au1000_private *) dev->priv;
-       unsigned char if_port;
-       u16 link, speed;
-
-       if (!dev) {
-               /* fatal error, don't restart the timer */
-               printk(KERN_ERR "au1000_timer error: NULL dev\n");
-               return;
-       }
-
-       if_port = dev->if_port;
-       if (aup->phy_ops->phy_status(dev, aup->phy_addr, &link, &speed) == 0) {
-               if (link) {
-                       if (!netif_carrier_ok(dev)) {
-                               netif_carrier_on(dev);
-                               printk(KERN_INFO "%s: link up\n", dev->name);
-                       }
-               }
-               else {
-                       if (netif_carrier_ok(dev)) {
-                               netif_carrier_off(dev);
-                               dev->if_port = 0;
-                               printk(KERN_INFO "%s: link down\n", dev->name);
-                       }
-               }
-       }
-
-       if (link && (dev->if_port != if_port) && 
-                       (dev->if_port != IF_PORT_UNKNOWN)) {
-               hard_stop(dev);
-               if (dev->if_port == IF_PORT_100BASEFX) {
-                       printk(KERN_INFO "%s: going to full duplex\n", 
-                                       dev->name);
-                       aup->mac->control |= MAC_FULL_DUPLEX;
-                       au_sync_delay(1);
-               }
-               else {
-                       aup->mac->control &= ~MAC_FULL_DUPLEX;
-                       au_sync_delay(1);
-               }
-               enable_rx_tx(dev);
-       }
-
-       aup->timer.expires = RUN_AT((1*HZ)); 
-       aup->timer.data = (unsigned long)dev;
-       aup->timer.function = &au1000_timer; /* timer handler */
-       add_timer(&aup->timer);
-
-}
-
-static int au1000_open(struct net_device *dev)
+static inline void au1000_update_rx_stats(struct net_device *dev, u32 status)
 {
-       int retval;
-       struct au1000_private *aup = (struct au1000_private *) dev->priv;
-
-       if (au1000_debug > 4)
-               printk("%s: open: dev=%p\n", dev->name, dev);
+       struct net_device_stats *ps = &dev->stats;
 
-       if ((retval = au1000_init(dev))) {
-               printk(KERN_ERR "%s: error in au1000_init\n", dev->name);
-               free_irq(dev->irq, dev);
-               return retval;
-       }
-       netif_start_queue(dev);
-
-       if ((retval = request_irq(dev->irq, &au1000_interrupt, 0, 
-                                       dev->name, dev))) {
-               printk(KERN_ERR "%s: unable to get IRQ %d\n", 
-                               dev->name, dev->irq);
-               return retval;
-       }
-
-       init_timer(&aup->timer); /* used in ioctl() */
-       aup->timer.expires = RUN_AT((3*HZ)); 
-       aup->timer.data = (unsigned long)dev;
-       aup->timer.function = &au1000_timer; /* timer handler */
-       add_timer(&aup->timer);
+       ps->rx_packets++;
+       if (status & RX_MCAST_FRAME)
+               ps->multicast++;
 
-       if (au1000_debug > 4)
-               printk("%s: open: Initialization done.\n", dev->name);
+       if (status & RX_ERROR) {
+               ps->rx_errors++;
+               if (status & RX_MISSED_FRAME)
+                       ps->rx_missed_errors++;
+               if (status & (RX_OVERLEN | RX_RUNT | RX_LEN_ERROR))
+                       ps->rx_length_errors++;
+               if (status & RX_CRC_ERROR)
+                       ps->rx_crc_errors++;
+               if (status & RX_COLL)
+                       ps->collisions++;
+       } else
+               ps->rx_bytes += status & RX_FRAME_LEN_MASK;
 
-       return 0;
 }
 
-static int au1000_close(struct net_device *dev)
+/*
+ * Au1000 receive routine.
+ */
+static int au1000_rx(struct net_device *dev)
 {
-       u32 flags;
-       struct au1000_private *aup = (struct au1000_private *) dev->priv;
-
-       if (au1000_debug > 4)
-               printk("%s: close: dev=%p\n", dev->name, dev);
-
-       reset_mac(dev);
-
-       spin_lock_irqsave(&aup->lock, flags);
-       
-       /* stop the device */
-       netif_stop_queue(dev);
+       struct au1000_private *aup = netdev_priv(dev);
+       struct sk_buff *skb;
+       struct rx_dma *prxd;
+       u32 buff_stat, status;
+       struct db_dest *pDB;
+       u32     frmlen;
 
-       /* disable the interrupt */
-       free_irq(dev->irq, dev);
-       spin_unlock_irqrestore(&aup->lock, flags);
+       netif_dbg(aup, rx_status, dev, "au1000_rx head %d\n", aup->rx_head);
 
-       return 0;
-}
+       prxd = aup->rx_dma_ring[aup->rx_head];
+       buff_stat = prxd->buff_stat;
+       while (buff_stat & RX_T_DONE)  {
+               status = prxd->status;
+               pDB = aup->rx_db_inuse[aup->rx_head];
+               au1000_update_rx_stats(dev, status);
+               if (!(status & RX_ERROR))  {
 
-static void __exit au1000_cleanup_module(void)
-{
-       int i, j;
-       struct net_device *dev;
-       struct au1000_private *aup;
-
-       for (i = 0; i < num_ifs; i++) {
-               dev = iflist[i].dev;
-               if (dev) {
-                       aup = (struct au1000_private *) dev->priv;
-                       unregister_netdev(dev);
-                       kfree(aup->mii);
-                       for (j = 0; j < NUM_RX_DMA; j++) {
-                               if (aup->rx_db_inuse[j])
-                                       ReleaseDB(aup, aup->rx_db_inuse[j]);
+                       /* good frame */
+                       frmlen = (status & RX_FRAME_LEN_MASK);
+                       frmlen -= 4; /* Remove FCS */
+                       skb = dev_alloc_skb(frmlen + 2);
+                       if (skb == NULL) {
+                               netdev_err(dev, "Memory squeeze, dropping packet.\n");
+                               dev->stats.rx_dropped++;
+                               continue;
                        }
-                       for (j = 0; j < NUM_TX_DMA; j++) {
-                               if (aup->tx_db_inuse[j])
-                                       ReleaseDB(aup, aup->tx_db_inuse[j]);
+                       skb_reserve(skb, 2);    /* 16 byte IP header align */
+                       skb_copy_to_linear_data(skb,
+                               (unsigned char *)pDB->vaddr, frmlen);
+                       skb_put(skb, frmlen);
+                       skb->protocol = eth_type_trans(skb, dev);
+                       netif_rx(skb);  /* pass the packet to upper layers */
+               } else {
+                       if (au1000_debug > 4) {
+                               pr_err("rx_error(s):");
+                               if (status & RX_MISSED_FRAME)
+                                       pr_cont(" miss");
+                               if (status & RX_WDOG_TIMER)
+                                       pr_cont(" wdog");
+                               if (status & RX_RUNT)
+                                       pr_cont(" runt");
+                               if (status & RX_OVERLEN)
+                                       pr_cont(" overlen");
+                               if (status & RX_COLL)
+                                       pr_cont(" coll");
+                               if (status & RX_MII_ERROR)
+                                       pr_cont(" mii error");
+                               if (status & RX_CRC_ERROR)
+                                       pr_cont(" crc error");
+                               if (status & RX_LEN_ERROR)
+                                       pr_cont(" len error");
+                               if (status & RX_U_CNTRL_FRAME)
+                                       pr_cont(" u control frame");
+                               pr_cont("\n");
                        }
-                       dma_free_noncoherent(NULL,
-                                       MAX_BUF_SIZE * (NUM_TX_BUFFS+NUM_RX_BUFFS),
-                                       (void *)aup->vaddr,
-                                       aup->dma_addr);
-                       free_netdev(dev);
-                       release_mem_region(CPHYSADDR(iflist[i].base_addr), MAC_IOSIZE);
                }
+               prxd->buff_stat = (u32)(pDB->dma_addr | RX_DMA_ENABLE);
+               aup->rx_head = (aup->rx_head + 1) & (NUM_RX_DMA - 1);
+               au_sync();
+
+               /* next descriptor */
+               prxd = aup->rx_dma_ring[aup->rx_head];
+               buff_stat = prxd->buff_stat;
        }
+       return 0;
 }
 
-
-static inline void 
-update_tx_stats(struct net_device *dev, u32 status, u32 pkt_len)
+static void au1000_update_tx_stats(struct net_device *dev, u32 status)
 {
-       struct au1000_private *aup = (struct au1000_private *) dev->priv;
-       struct net_device_stats *ps = &aup->stats;
-
-       ps->tx_packets++;
-       ps->tx_bytes += pkt_len;
+       struct au1000_private *aup = netdev_priv(dev);
+       struct net_device_stats *ps = &dev->stats;
 
        if (status & TX_FRAME_ABORTED) {
-               if (dev->if_port == IF_PORT_100BASEFX) {
+               if (!aup->phy_dev || (DUPLEX_FULL == aup->phy_dev->duplex)) {
                        if (status & (TX_JAB_TIMEOUT | TX_UNDERRUN)) {
                                /* any other tx errors are only valid
-                                * in half duplex mode */
+                                * in half duplex mode
+                                */
                                ps->tx_errors++;
                                ps->tx_aborted_errors++;
                        }
-               }
-               else {
+               } else {
                        ps->tx_errors++;
                        ps->tx_aborted_errors++;
                        if (status & (TX_NO_CARRIER | TX_LOSS_CARRIER))
@@ -1853,7 +797,6 @@ update_tx_stats(struct net_device *dev, u32 status, u32 pkt_len)
        }
 }
 
-
 /*
  * Called from the interrupt service routine to acknowledge
  * the TX DONE bits.  This is a must if the irq is setup as
@@ -1861,13 +804,13 @@ update_tx_stats(struct net_device *dev, u32 status, u32 pkt_len)
  */
 static void au1000_tx_ack(struct net_device *dev)
 {
-       struct au1000_private *aup = (struct au1000_private *) dev->priv;
-       volatile tx_dma_t *ptxd;
+       struct au1000_private *aup = netdev_priv(dev);
+       struct tx_dma *ptxd;
 
        ptxd = aup->tx_dma_ring[aup->tx_tail];
 
        while (ptxd->buff_stat & TX_T_DONE) {
-               update_tx_stats(dev, ptxd->status, ptxd->len & 0x3ff);
+               au1000_update_tx_stats(dev, ptxd->status);
                ptxd->buff_stat &= ~TX_T_DONE;
                ptxd->len = 0;
                au_sync();
@@ -1882,21 +825,92 @@ static void au1000_tx_ack(struct net_device *dev)
        }
 }
 
+/*
+ * Au1000 interrupt service routine.
+ */
+static irqreturn_t au1000_interrupt(int irq, void *dev_id)
+{
+       struct net_device *dev = dev_id;
+
+       /* Handle RX interrupts first to minimize chance of overrun */
+
+       au1000_rx(dev);
+       au1000_tx_ack(dev);
+       return IRQ_RETVAL(1);
+}
+
+static int au1000_open(struct net_device *dev)
+{
+       int retval;
+       struct au1000_private *aup = netdev_priv(dev);
+
+       netif_dbg(aup, drv, dev, "open: dev=%p\n", dev);
+
+       retval = request_irq(dev->irq, au1000_interrupt, 0,
+                                       dev->name, dev);
+       if (retval) {
+               netdev_err(dev, "unable to get IRQ %d\n", dev->irq);
+               return retval;
+       }
+
+       retval = au1000_init(dev);
+       if (retval) {
+               netdev_err(dev, "error in au1000_init\n");
+               free_irq(dev->irq, dev);
+               return retval;
+       }
+
+       if (aup->phy_dev) {
+               /* cause the PHY state machine to schedule a link state check */
+               aup->phy_dev->state = PHY_CHANGELINK;
+               phy_start(aup->phy_dev);
+       }
+
+       netif_start_queue(dev);
+
+       netif_dbg(aup, drv, dev, "open: Initialization done.\n");
+
+       return 0;
+}
+
+static int au1000_close(struct net_device *dev)
+{
+       unsigned long flags;
+       struct au1000_private *const aup = netdev_priv(dev);
+
+       netif_dbg(aup, drv, dev, "close: dev=%p\n", dev);
+
+       if (aup->phy_dev)
+               phy_stop(aup->phy_dev);
+
+       spin_lock_irqsave(&aup->lock, flags);
+
+       au1000_reset_mac_unlocked(dev);
+
+       /* stop the device */
+       netif_stop_queue(dev);
+
+       /* disable the interrupt */
+       free_irq(dev->irq, dev);
+       spin_unlock_irqrestore(&aup->lock, flags);
+
+       return 0;
+}
 
 /*
  * Au1000 transmit routine.
  */
-static int au1000_tx(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t au1000_tx(struct sk_buff *skb, struct net_device *dev)
 {
-       struct au1000_private *aup = (struct au1000_private *) dev->priv;
-       volatile tx_dma_t *ptxd;
+       struct au1000_private *aup = netdev_priv(dev);
+       struct net_device_stats *ps = &dev->stats;
+       struct tx_dma *ptxd;
        u32 buff_stat;
-       db_dest_t *pDB;
+       struct db_dest *pDB;
        int i;
 
-       if (au1000_debug > 5)
-               printk("%s: tx: aup %x len=%d, data=%p, head %d\n", 
-                               dev->name, (unsigned)aup, skb->len, 
+       netif_dbg(aup, tx_queued, dev, "tx: aup %x len=%d, data=%p, head %d\n",
+                               (unsigned)aup, skb->len,
                                skb->data, aup->tx_head);
 
        ptxd = aup->tx_dma_ring[aup->tx_head];
@@ -1905,10 +919,9 @@ static int au1000_tx(struct sk_buff *skb, struct net_device *dev)
                /* We've wrapped around and the transmitter is still busy */
                netif_stop_queue(dev);
                aup->tx_full = 1;
-               return 1;
-       }
-       else if (buff_stat & TX_T_DONE) {
-               update_tx_stats(dev, ptxd->status, ptxd->len & 0x3ff);
+               return NETDEV_TX_BUSY;
+       } else if (buff_stat & TX_T_DONE) {
+               au1000_update_tx_stats(dev, ptxd->status);
                ptxd->len = 0;
        }
 
@@ -1918,346 +931,402 @@ static int au1000_tx(struct sk_buff *skb, struct net_device *dev)
        }
 
        pDB = aup->tx_db_inuse[aup->tx_head];
-       memcpy((void *)pDB->vaddr, skb->data, skb->len);
+       skb_copy_from_linear_data(skb, (void *)pDB->vaddr, skb->len);
        if (skb->len < ETH_ZLEN) {
-               for (i=skb->len; i<ETH_ZLEN; i++) { 
+               for (i = skb->len; i < ETH_ZLEN; i++)
                        ((char *)pDB->vaddr)[i] = 0;
-               }
+
                ptxd->len = ETH_ZLEN;
-       }
-       else
+       } else
                ptxd->len = skb->len;
 
+       ps->tx_packets++;
+       ps->tx_bytes += ptxd->len;
+
        ptxd->buff_stat = pDB->dma_addr | TX_DMA_ENABLE;
        au_sync();
        dev_kfree_skb(skb);
        aup->tx_head = (aup->tx_head + 1) & (NUM_TX_DMA - 1);
-       dev->trans_start = jiffies;
-       return 0;
+       return NETDEV_TX_OK;
 }
 
+/*
+ * The Tx ring has been full longer than the watchdog timeout
+ * value. The transmitter must be hung?
+ */
+static void au1000_tx_timeout(struct net_device *dev)
+{
+       netdev_err(dev, "au1000_tx_timeout: dev=%p\n", dev);
+       au1000_reset_mac(dev);
+       au1000_init(dev);
+       dev->trans_start = jiffies; /* prevent tx timeout */
+       netif_wake_queue(dev);
+}
 
-static inline void update_rx_stats(struct net_device *dev, u32 status)
+static void au1000_multicast_list(struct net_device *dev)
 {
-       struct au1000_private *aup = (struct au1000_private *) dev->priv;
-       struct net_device_stats *ps = &aup->stats;
+       struct au1000_private *aup = netdev_priv(dev);
+       u32 reg;
 
-       ps->rx_packets++;
-       if (status & RX_MCAST_FRAME)
-               ps->multicast++;
+       netif_dbg(aup, drv, dev, "%s: flags=%x\n", __func__, dev->flags);
+       reg = readl(&aup->mac->control);
+       if (dev->flags & IFF_PROMISC) {                 /* Set promiscuous. */
+               reg |= MAC_PROMISCUOUS;
+       } else if ((dev->flags & IFF_ALLMULTI)  ||
+                          netdev_mc_count(dev) > MULTICAST_FILTER_LIMIT) {
+               reg |= MAC_PASS_ALL_MULTI;
+               reg &= ~MAC_PROMISCUOUS;
+               netdev_info(dev, "Pass all multicast\n");
+       } else {
+               struct netdev_hw_addr *ha;
+               u32 mc_filter[2];       /* Multicast hash filter */
 
-       if (status & RX_ERROR) {
-               ps->rx_errors++;
-               if (status & RX_MISSED_FRAME)
-                       ps->rx_missed_errors++;
-               if (status & (RX_OVERLEN | RX_OVERLEN | RX_LEN_ERROR))
-                       ps->rx_length_errors++;
-               if (status & RX_CRC_ERROR)
-                       ps->rx_crc_errors++;
-               if (status & RX_COLL)
-                       ps->collisions++;
+               mc_filter[1] = mc_filter[0] = 0;
+               netdev_for_each_mc_addr(ha, dev)
+                       set_bit(ether_crc(ETH_ALEN, ha->addr)>>26,
+                                       (long *)mc_filter);
+               writel(mc_filter[1], &aup->mac->multi_hash_high);
+               writel(mc_filter[0], &aup->mac->multi_hash_low);
+               reg &= ~MAC_PROMISCUOUS;
+               reg |= MAC_HASH_MODE;
        }
-       else 
-               ps->rx_bytes += status & RX_FRAME_LEN_MASK;
-
+       writel(reg, &aup->mac->control);
 }
 
-/*
- * Au1000 receive routine.
- */
-static int au1000_rx(struct net_device *dev)
+static int au1000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
-       struct au1000_private *aup = (struct au1000_private *) dev->priv;
-       struct sk_buff *skb;
-       volatile rx_dma_t *prxd;
-       u32 buff_stat, status;
-       db_dest_t *pDB;
-       u32     frmlen;
+       struct au1000_private *aup = netdev_priv(dev);
 
-       if (au1000_debug > 5)
-               printk("%s: au1000_rx head %d\n", dev->name, aup->rx_head);
+       if (!netif_running(dev))
+               return -EINVAL;
 
-       prxd = aup->rx_dma_ring[aup->rx_head];
-       buff_stat = prxd->buff_stat;
-       while (buff_stat & RX_T_DONE)  {
-               status = prxd->status;
-               pDB = aup->rx_db_inuse[aup->rx_head];
-               update_rx_stats(dev, status);
-               if (!(status & RX_ERROR))  {
+       if (!aup->phy_dev)
+               return -EINVAL; /* PHY not controllable */
 
-                       /* good frame */
-                       frmlen = (status & RX_FRAME_LEN_MASK);
-                       frmlen -= 4; /* Remove FCS */
-                       skb = dev_alloc_skb(frmlen + 2);
-                       if (skb == NULL) {
-                               printk(KERN_ERR
-                                      "%s: Memory squeeze, dropping packet.\n",
-                                      dev->name);
-                               aup->stats.rx_dropped++;
-                               continue;
-                       }
-                       skb->dev = dev;
-                       skb_reserve(skb, 2);    /* 16 byte IP header align */
-                       eth_copy_and_sum(skb,
-                               (unsigned char *)pDB->vaddr, frmlen, 0);
-                       skb_put(skb, frmlen);
-                       skb->protocol = eth_type_trans(skb, dev);
-                       netif_rx(skb);  /* pass the packet to upper layers */
-               }
-               else {
-                       if (au1000_debug > 4) {
-                               if (status & RX_MISSED_FRAME) 
-                                       printk("rx miss\n");
-                               if (status & RX_WDOG_TIMER) 
-                                       printk("rx wdog\n");
-                               if (status & RX_RUNT) 
-                                       printk("rx runt\n");
-                               if (status & RX_OVERLEN) 
-                                       printk("rx overlen\n");
-                               if (status & RX_COLL)
-                                       printk("rx coll\n");
-                               if (status & RX_MII_ERROR)
-                                       printk("rx mii error\n");
-                               if (status & RX_CRC_ERROR)
-                                       printk("rx crc error\n");
-                               if (status & RX_LEN_ERROR)
-                                       printk("rx len error\n");
-                               if (status & RX_U_CNTRL_FRAME)
-                                       printk("rx u control frame\n");
-                               if (status & RX_MISSED_FRAME)
-                                       printk("rx miss\n");
-                       }
-               }
-               prxd->buff_stat = (u32)(pDB->dma_addr | RX_DMA_ENABLE);
-               aup->rx_head = (aup->rx_head + 1) & (NUM_RX_DMA - 1);
-               au_sync();
-
-               /* next descriptor */
-               prxd = aup->rx_dma_ring[aup->rx_head];
-               buff_stat = prxd->buff_stat;
-               dev->last_rx = jiffies;
-       }
-       return 0;
+       return phy_mii_ioctl(aup->phy_dev, rq, cmd);
 }
 
+static const struct net_device_ops au1000_netdev_ops = {
+       .ndo_open               = au1000_open,
+       .ndo_stop               = au1000_close,
+       .ndo_start_xmit         = au1000_tx,
+       .ndo_set_multicast_list = au1000_multicast_list,
+       .ndo_do_ioctl           = au1000_ioctl,
+       .ndo_tx_timeout         = au1000_tx_timeout,
+       .ndo_set_mac_address    = eth_mac_addr,
+       .ndo_validate_addr      = eth_validate_addr,
+       .ndo_change_mtu         = eth_change_mtu,
+};
 
-/*
- * Au1000 interrupt service routine.
- */
-static irqreturn_t au1000_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static int __devinit au1000_probe(struct platform_device *pdev)
 {
-       struct net_device *dev = (struct net_device *) dev_id;
+       static unsigned version_printed;
+       struct au1000_private *aup = NULL;
+       struct au1000_eth_platform_data *pd;
+       struct net_device *dev = NULL;
+       struct db_dest *pDB, *pDBfree;
+       int irq, i, err = 0;
+       struct resource *base, *macen;
 
-       if (dev == NULL) {
-               printk(KERN_ERR "%s: isr: null dev ptr\n", dev->name);
-               return IRQ_RETVAL(1);
+       base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!base) {
+               dev_err(&pdev->dev, "failed to retrieve base register\n");
+               err = -ENODEV;
+               goto out;
        }
 
-       /* Handle RX interrupts first to minimize chance of overrun */
+       macen = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+       if (!macen) {
+               dev_err(&pdev->dev, "failed to retrieve MAC Enable register\n");
+               err = -ENODEV;
+               goto out;
+       }
 
-       au1000_rx(dev);
-       au1000_tx_ack(dev);
-       return IRQ_RETVAL(1);
-}
+       irq = platform_get_irq(pdev, 0);
+       if (irq < 0) {
+               dev_err(&pdev->dev, "failed to retrieve IRQ\n");
+               err = -ENODEV;
+               goto out;
+       }
 
+       if (!request_mem_region(base->start, resource_size(base),
+                                                       pdev->name)) {
+               dev_err(&pdev->dev, "failed to request memory region for base registers\n");
+               err = -ENXIO;
+               goto out;
+       }
 
-/*
- * The Tx ring has been full longer than the watchdog timeout
- * value. The transmitter must be hung?
- */
-static void au1000_tx_timeout(struct net_device *dev)
-{
-       printk(KERN_ERR "%s: au1000_tx_timeout: dev=%p\n", dev->name, dev);
-       reset_mac(dev);
-       au1000_init(dev);
-       dev->trans_start = jiffies;
-       netif_wake_queue(dev);
-}
+       if (!request_mem_region(macen->start, resource_size(macen),
+                                                       pdev->name)) {
+               dev_err(&pdev->dev, "failed to request memory region for MAC enable register\n");
+               err = -ENXIO;
+               goto err_request;
+       }
 
+       dev = alloc_etherdev(sizeof(struct au1000_private));
+       if (!dev) {
+               dev_err(&pdev->dev, "alloc_etherdev failed\n");
+               err = -ENOMEM;
+               goto err_alloc;
+       }
 
-static unsigned const ethernet_polynomial = 0x04c11db7U;
-static inline u32 ether_crc(int length, unsigned char *data)
-{
-    int crc = -1;
-
-    while(--length >= 0) {
-               unsigned char current_octet = *data++;
-               int bit;
-               for (bit = 0; bit < 8; bit++, current_octet >>= 1)
-                       crc = (crc << 1) ^
-                               ((crc < 0) ^ (current_octet & 1) ? 
-                                ethernet_polynomial : 0);
-    }
-    return crc;
-}
+       SET_NETDEV_DEV(dev, &pdev->dev);
+       platform_set_drvdata(pdev, dev);
+       aup = netdev_priv(dev);
 
-static void set_rx_mode(struct net_device *dev)
-{
-       struct au1000_private *aup = (struct au1000_private *) dev->priv;
+       spin_lock_init(&aup->lock);
+       aup->msg_enable = (au1000_debug < 4 ?
+                               AU1000_DEF_MSG_ENABLE : au1000_debug);
 
-       if (au1000_debug > 4) 
-               printk("%s: set_rx_mode: flags=%x\n", dev->name, dev->flags);
+       /* Allocate the data buffers
+        * Snooping works fine with eth on all au1xxx
+        */
+       aup->vaddr = (u32)dma_alloc_noncoherent(NULL, MAX_BUF_SIZE *
+                                               (NUM_TX_BUFFS + NUM_RX_BUFFS),
+                                               &aup->dma_addr, 0);
+       if (!aup->vaddr) {
+               dev_err(&pdev->dev, "failed to allocate data buffers\n");
+               err = -ENOMEM;
+               goto err_vaddr;
+       }
 
-       if (dev->flags & IFF_PROMISC) {                 /* Set promiscuous. */
-               aup->mac->control |= MAC_PROMISCUOUS;
-               printk(KERN_INFO "%s: Promiscuous mode enabled.\n", dev->name);
-       } else if ((dev->flags & IFF_ALLMULTI)  ||
-                          dev->mc_count > MULTICAST_FILTER_LIMIT) {
-               aup->mac->control |= MAC_PASS_ALL_MULTI;
-               aup->mac->control &= ~MAC_PROMISCUOUS;
-               printk(KERN_INFO "%s: Pass all multicast\n", dev->name);
+       /* aup->mac is the base address of the MAC's registers */
+       aup->mac = (struct mac_reg *)
+                       ioremap_nocache(base->start, resource_size(base));
+       if (!aup->mac) {
+               dev_err(&pdev->dev, "failed to ioremap MAC registers\n");
+               err = -ENXIO;
+               goto err_remap1;
+       }
+
+       /* Setup some variables for quick register address access */
+       aup->enable = (u32 *)ioremap_nocache(macen->start,
+                                               resource_size(macen));
+       if (!aup->enable) {
+               dev_err(&pdev->dev, "failed to ioremap MAC enable register\n");
+               err = -ENXIO;
+               goto err_remap2;
+       }
+       aup->mac_id = pdev->id;
+
+       if (pdev->id == 0)
+               au1000_setup_hw_rings(aup, MAC0_RX_DMA_ADDR, MAC0_TX_DMA_ADDR);
+       else if (pdev->id == 1)
+               au1000_setup_hw_rings(aup, MAC1_RX_DMA_ADDR, MAC1_TX_DMA_ADDR);
+
+       /* set a random MAC now in case platform_data doesn't provide one */
+       random_ether_addr(dev->dev_addr);
+
+       writel(0, aup->enable);
+       aup->mac_enabled = 0;
+
+       pd = pdev->dev.platform_data;
+       if (!pd) {
+               dev_info(&pdev->dev, "no platform_data passed,"
+                                       " PHY search on MAC0\n");
+               aup->phy1_search_mac0 = 1;
        } else {
-               int i;
-               struct dev_mc_list *mclist;
-               u32 mc_filter[2];       /* Multicast hash filter */
+               if (is_valid_ether_addr(pd->mac))
+                       memcpy(dev->dev_addr, pd->mac, 6);
+
+               aup->phy_static_config = pd->phy_static_config;
+               aup->phy_search_highest_addr = pd->phy_search_highest_addr;
+               aup->phy1_search_mac0 = pd->phy1_search_mac0;
+               aup->phy_addr = pd->phy_addr;
+               aup->phy_busid = pd->phy_busid;
+               aup->phy_irq = pd->phy_irq;
+       }
+
+       if (aup->phy_busid && aup->phy_busid > 0) {
+               dev_err(&pdev->dev, "MAC0-associated PHY attached 2nd MACs MII bus not supported yet\n");
+               err = -ENODEV;
+               goto err_mdiobus_alloc;
+       }
+
+       aup->mii_bus = mdiobus_alloc();
+       if (aup->mii_bus == NULL) {
+               dev_err(&pdev->dev, "failed to allocate mdiobus structure\n");
+               err = -ENOMEM;
+               goto err_mdiobus_alloc;
+       }
+
+       aup->mii_bus->priv = dev;
+       aup->mii_bus->read = au1000_mdiobus_read;
+       aup->mii_bus->write = au1000_mdiobus_write;
+       aup->mii_bus->reset = au1000_mdiobus_reset;
+       aup->mii_bus->name = "au1000_eth_mii";
+       snprintf(aup->mii_bus->id, MII_BUS_ID_SIZE, "%x", aup->mac_id);
+       aup->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
+       if (aup->mii_bus->irq == NULL)
+               goto err_out;
 
-               mc_filter[1] = mc_filter[0] = 0;
-               for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count;
-                        i++, mclist = mclist->next) {
-                       set_bit(ether_crc(ETH_ALEN, mclist->dmi_addr)>>26, 
-                                       (long *)mc_filter);
-               }
-               aup->mac->multi_hash_high = mc_filter[1];
-               aup->mac->multi_hash_low = mc_filter[0];
-               aup->mac->control &= ~MAC_PROMISCUOUS;
-               aup->mac->control |= MAC_HASH_MODE;
+       for (i = 0; i < PHY_MAX_ADDR; ++i)
+               aup->mii_bus->irq[i] = PHY_POLL;
+       /* if known, set corresponding PHY IRQs */
+       if (aup->phy_static_config)
+               if (aup->phy_irq && aup->phy_busid == aup->mac_id)
+                       aup->mii_bus->irq[aup->phy_addr] = aup->phy_irq;
+
+       err = mdiobus_register(aup->mii_bus);
+       if (err) {
+               dev_err(&pdev->dev, "failed to register MDIO bus\n");
+               goto err_mdiobus_reg;
        }
-}
 
+       if (au1000_mii_probe(dev) != 0)
+               goto err_out;
 
-static int au1000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-{
-       struct au1000_private *aup = (struct au1000_private *)dev->priv;
-       u16 *data = (u16 *)&rq->ifr_ifru;
-
-       switch(cmd) { 
-               case SIOCDEVPRIVATE:    /* Get the address of the PHY in use. */
-               case SIOCGMIIPHY:
-                       if (!netif_running(dev)) return -EINVAL;
-                       data[0] = aup->phy_addr;
-               case SIOCDEVPRIVATE+1:  /* Read the specified MII register. */
-               case SIOCGMIIREG:
-                       data[3] =  mdio_read(dev, data[0], data[1]); 
-                       return 0;
-               case SIOCDEVPRIVATE+2:  /* Write the specified MII register */
-               case SIOCSMIIREG: 
-                       if (!capable(CAP_NET_ADMIN))
-                               return -EPERM;
-                       mdio_write(dev, data[0], data[1],data[2]);
-                       return 0;
-               default:
-                       return -EOPNOTSUPP;
+       pDBfree = NULL;
+       /* setup the data buffer descriptors and attach a buffer to each one */
+       pDB = aup->db;
+       for (i = 0; i < (NUM_TX_BUFFS+NUM_RX_BUFFS); i++) {
+               pDB->pnext = pDBfree;
+               pDBfree = pDB;
+               pDB->vaddr = (u32 *)((unsigned)aup->vaddr + MAX_BUF_SIZE*i);
+               pDB->dma_addr = (dma_addr_t)virt_to_bus(pDB->vaddr);
+               pDB++;
        }
+       aup->pDBfree = pDBfree;
 
-}
-
+       for (i = 0; i < NUM_RX_DMA; i++) {
+               pDB = au1000_GetFreeDB(aup);
+               if (!pDB)
+                       goto err_out;
 
-static int au1000_set_config(struct net_device *dev, struct ifmap *map)
-{
-       struct au1000_private *aup = (struct au1000_private *) dev->priv;
-       u16 control;
+               aup->rx_dma_ring[i]->buff_stat = (unsigned)pDB->dma_addr;
+               aup->rx_db_inuse[i] = pDB;
+       }
+       for (i = 0; i < NUM_TX_DMA; i++) {
+               pDB = au1000_GetFreeDB(aup);
+               if (!pDB)
+                       goto err_out;
 
-       if (au1000_debug > 4)  {
-               printk("%s: set_config called: dev->if_port %d map->port %x\n", 
-                               dev->name, dev->if_port, map->port);
+               aup->tx_dma_ring[i]->buff_stat = (unsigned)pDB->dma_addr;
+               aup->tx_dma_ring[i]->len = 0;
+               aup->tx_db_inuse[i] = pDB;
        }
 
-       switch(map->port){
-               case IF_PORT_UNKNOWN: /* use auto here */   
-                       printk(KERN_INFO "%s: config phy for aneg\n", 
-                                       dev->name);
-                       dev->if_port = map->port;
-                       /* Link Down: the timer will bring it up */
-                       netif_carrier_off(dev);
-       
-                       /* read current control */
-                       control = mdio_read(dev, aup->phy_addr, MII_CONTROL);
-                       control &= ~(MII_CNTL_FDX | MII_CNTL_F100);
-
-                       /* enable auto negotiation and reset the negotiation */
-                       mdio_write(dev, aup->phy_addr, MII_CONTROL, 
-                                       control | MII_CNTL_AUTO | 
-                                       MII_CNTL_RST_AUTO);
+       dev->base_addr = base->start;
+       dev->irq = irq;
+       dev->netdev_ops = &au1000_netdev_ops;
+       SET_ETHTOOL_OPS(dev, &au1000_ethtool_ops);
+       dev->watchdog_timeo = ETH_TX_TIMEOUT;
 
-                       break;
-    
-               case IF_PORT_10BASET: /* 10BaseT */         
-                       printk(KERN_INFO "%s: config phy for 10BaseT\n", 
-                                       dev->name);
-                       dev->if_port = map->port;
-       
-                       /* Link Down: the timer will bring it up */
-                       netif_carrier_off(dev);
-
-                       /* set Speed to 10Mbps, Half Duplex */
-                       control = mdio_read(dev, aup->phy_addr, MII_CONTROL);
-                       control &= ~(MII_CNTL_F100 | MII_CNTL_AUTO | 
-                                       MII_CNTL_FDX);
-       
-                       /* disable auto negotiation and force 10M/HD mode*/
-                       mdio_write(dev, aup->phy_addr, MII_CONTROL, control);
-                       break;
-    
-               case IF_PORT_100BASET: /* 100BaseT */
-               case IF_PORT_100BASETX: /* 100BaseTx */ 
-                       printk(KERN_INFO "%s: config phy for 100BaseTX\n", 
-                                       dev->name);
-                       dev->if_port = map->port;
-       
-                       /* Link Down: the timer will bring it up */
-                       netif_carrier_off(dev);
-       
-                       /* set Speed to 100Mbps, Half Duplex */
-                       /* disable auto negotiation and enable 100MBit Mode */
-                       control = mdio_read(dev, aup->phy_addr, MII_CONTROL);
-                       control &= ~(MII_CNTL_AUTO | MII_CNTL_FDX);
-                       control |= MII_CNTL_F100;
-                       mdio_write(dev, aup->phy_addr, MII_CONTROL, control);
-                       break;
-    
-               case IF_PORT_100BASEFX: /* 100BaseFx */
-                       printk(KERN_INFO "%s: config phy for 100BaseFX\n", 
-                                       dev->name);
-                       dev->if_port = map->port;
-       
-                       /* Link Down: the timer will bring it up */
-                       netif_carrier_off(dev);
-       
-                       /* set Speed to 100Mbps, Full Duplex */
-                       /* disable auto negotiation and enable 100MBit Mode */
-                       control = mdio_read(dev, aup->phy_addr, MII_CONTROL);
-                       control &= ~MII_CNTL_AUTO;
-                       control |=  MII_CNTL_F100 | MII_CNTL_FDX;
-                       mdio_write(dev, aup->phy_addr, MII_CONTROL, control);
-                       break;
-               case IF_PORT_10BASE2: /* 10Base2 */
-               case IF_PORT_AUI: /* AUI */
-               /* These Modes are not supported (are they?)*/
-                       printk(KERN_ERR "%s: 10Base2/AUI not supported", 
-                                       dev->name);
-                       return -EOPNOTSUPP;
-                       break;
-    
-               default:
-                       printk(KERN_ERR "%s: Invalid media selected", 
-                                       dev->name);
-                       return -EINVAL;
+       /*
+        * The boot code uses the ethernet controller, so reset it to start
+        * fresh.  au1000_init() expects that the device is in reset state.
+        */
+       au1000_reset_mac(dev);
+
+       err = register_netdev(dev);
+       if (err) {
+               netdev_err(dev, "Cannot register net device, aborting.\n");
+               goto err_out;
        }
+
+       netdev_info(dev, "Au1xx0 Ethernet found at 0x%lx, irq %d\n",
+                       (unsigned long)base->start, irq);
+       if (version_printed++ == 0)
+               pr_info("%s version %s %s\n",
+                                       DRV_NAME, DRV_VERSION, DRV_AUTHOR);
+
        return 0;
+
+err_out:
+       if (aup->mii_bus != NULL)
+               mdiobus_unregister(aup->mii_bus);
+
+       /* here we should have a valid dev plus aup-> register addresses
+        * so we can reset the mac properly.
+        */
+       au1000_reset_mac(dev);
+
+       for (i = 0; i < NUM_RX_DMA; i++) {
+               if (aup->rx_db_inuse[i])
+                       au1000_ReleaseDB(aup, aup->rx_db_inuse[i]);
+       }
+       for (i = 0; i < NUM_TX_DMA; i++) {
+               if (aup->tx_db_inuse[i])
+                       au1000_ReleaseDB(aup, aup->tx_db_inuse[i]);
+       }
+err_mdiobus_reg:
+       mdiobus_free(aup->mii_bus);
+err_mdiobus_alloc:
+       iounmap(aup->enable);
+err_remap2:
+       iounmap(aup->mac);
+err_remap1:
+       dma_free_noncoherent(NULL, MAX_BUF_SIZE * (NUM_TX_BUFFS + NUM_RX_BUFFS),
+                            (void *)aup->vaddr, aup->dma_addr);
+err_vaddr:
+       free_netdev(dev);
+err_alloc:
+       release_mem_region(macen->start, resource_size(macen));
+err_request:
+       release_mem_region(base->start, resource_size(base));
+out:
+       return err;
 }
 
-static struct net_device_stats *au1000_get_stats(struct net_device *dev)
+static int __devexit au1000_remove(struct platform_device *pdev)
 {
-       struct au1000_private *aup = (struct au1000_private *) dev->priv;
+       struct net_device *dev = platform_get_drvdata(pdev);
+       struct au1000_private *aup = netdev_priv(dev);
+       int i;
+       struct resource *base, *macen;
 
-       if (au1000_debug > 4)
-               printk("%s: au1000_get_stats: dev=%p\n", dev->name, dev);
+       platform_set_drvdata(pdev, NULL);
+
+       unregister_netdev(dev);
+       mdiobus_unregister(aup->mii_bus);
+       mdiobus_free(aup->mii_bus);
+
+       for (i = 0; i < NUM_RX_DMA; i++)
+               if (aup->rx_db_inuse[i])
+                       au1000_ReleaseDB(aup, aup->rx_db_inuse[i]);
+
+       for (i = 0; i < NUM_TX_DMA; i++)
+               if (aup->tx_db_inuse[i])
+                       au1000_ReleaseDB(aup, aup->tx_db_inuse[i]);
+
+       dma_free_noncoherent(NULL, MAX_BUF_SIZE *
+                       (NUM_TX_BUFFS + NUM_RX_BUFFS),
+                       (void *)aup->vaddr, aup->dma_addr);
+
+       iounmap(aup->mac);
+       iounmap(aup->enable);
+
+       base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       release_mem_region(base->start, resource_size(base));
+
+       macen = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+       release_mem_region(macen->start, resource_size(macen));
+
+       free_netdev(dev);
 
-       if (netif_device_present(dev)) {
-               return &aup->stats;
-       }
        return 0;
 }
 
+static struct platform_driver au1000_eth_driver = {
+       .probe  = au1000_probe,
+       .remove = __devexit_p(au1000_remove),
+       .driver = {
+               .name   = "au1000-eth",
+               .owner  = THIS_MODULE,
+       },
+};
+MODULE_ALIAS("platform:au1000-eth");
+
+
+static int __init au1000_init_module(void)
+{
+       return platform_driver_register(&au1000_eth_driver);
+}
+
+static void __exit au1000_exit_module(void)
+{
+       platform_driver_unregister(&au1000_eth_driver);
+}
+
 module_init(au1000_init_module);
-module_exit(au1000_cleanup_module);
+module_exit(au1000_exit_module);