Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (107 commits)
  smc911x: fix compilation breakage wjen debug is on
  [netdrvr] eexpress: minor corrections
  add NAPI support to sb1250-mac.c
  ixgb: ROUND_UP macro cleanup in drivers/net/ixgb
  e1000: ROUND_UP macro cleanup in drivers/net/e1000
  Generic HDLC sparse annotations
  e100: Optionally use I/O mode only to access register space
  e100: allow bad MAC address when running with invalid eeprom csum
  ehea: fix for dlpar support
  ehea: fix for sysfs entries
  3C509: Remove unnecessary include of <linux/pm_legacy.h>
  NetXen: Fix for vmalloc issues
  NetXen: Fixes for Power PC architecture
  NetXen: Port swap feature for multi port cards
  NetXen: Removal of redundant macros
  NetXen: Multi PCI support for Quad cards
  NetXen: Removal of redundant argument passing
  NetXen: Use multiple PCI functions
  [netdrvr e100] experiment with doing RX in a similar manner to eepro100
  [PATCH] ieee80211: add missing global needed by IEEE80211_DEBUG_XXXX
  ...

1 files changed, 346 insertions, 600 deletions

diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 639e1e6913bf..16b9acdabbe8 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -29,6 +29,7 @@
 #include <linux/fsl_devices.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
+#include <linux/phy.h>
 #include <linux/workqueue.h>
 
 #include <asm/of_platform.h>
@@ -41,12 +42,13 @@
 #include <asm/ucc_fast.h>
 
 #include "ucc_geth.h"
-#include "ucc_geth_phy.h"
+#include "ucc_geth_mii.h"
 
 #undef DEBUG
 
-#define DRV_DESC "QE UCC Gigabit Ethernet Controller version:Sept 11, 2006"
+#define DRV_DESC "QE UCC Gigabit Ethernet Controller"
 #define DRV_NAME "ucc_geth"
+#define DRV_VERSION "1.1"
 
 #define ugeth_printk(level, format, arg...)  \
         printk(level format "\n", ## arg)
@@ -73,22 +75,13 @@ static struct ucc_geth_info ugeth_primary_info = {
                     .bd_mem_part = MEM_PART_SYSTEM,
                     .rtsm = UCC_FAST_SEND_IDLES_BETWEEN_FRAMES,
                     .max_rx_buf_length = 1536,
-/* FIXME: should be changed in run time for 1G and 100M */
-#ifdef CONFIG_UGETH_HAS_GIGA
-                    .urfs = UCC_GETH_URFS_GIGA_INIT,
-                    .urfet = UCC_GETH_URFET_GIGA_INIT,
-                    .urfset = UCC_GETH_URFSET_GIGA_INIT,
-                    .utfs = UCC_GETH_UTFS_GIGA_INIT,
-                    .utfet = UCC_GETH_UTFET_GIGA_INIT,
-                    .utftt = UCC_GETH_UTFTT_GIGA_INIT,
-#else
+                    /* adjusted at startup if max-speed 1000 */
                     .urfs = UCC_GETH_URFS_INIT,
                     .urfet = UCC_GETH_URFET_INIT,
                     .urfset = UCC_GETH_URFSET_INIT,
                     .utfs = UCC_GETH_UTFS_INIT,
                     .utfet = UCC_GETH_UTFET_INIT,
                     .utftt = UCC_GETH_UTFTT_INIT,
-#endif
                     .ufpt = 256,
                     .mode = UCC_FAST_PROTOCOL_MODE_ETHERNET,
                     .ttx_trx = UCC_FAST_GUMR_TRANSPARENT_TTX_TRX_NORMAL,
@@ -217,70 +210,6 @@ static struct list_head *dequeue(struct list_head *lh)
         }
 }
 
-static int get_interface_details(enum enet_interface enet_interface,
-                                 enum enet_speed *speed,
-                                 int *r10m,
-                                 int *rmm,
-                                 int *rpm,
-                                 int *tbi, int *limited_to_full_duplex)
-{
-        /* Analyze enet_interface according to Interface Mode
-        Configuration table */
-        switch (enet_interface) {
-        case ENET_10_MII:
-                *speed = ENET_SPEED_10BT;
-                break;
-        case ENET_10_RMII:
-                *speed = ENET_SPEED_10BT;
-                *r10m = 1;
-                *rmm = 1;
-                break;
-        case ENET_10_RGMII:
-                *speed = ENET_SPEED_10BT;
-                *rpm = 1;
-                *r10m = 1;
-                *limited_to_full_duplex = 1;
-                break;
-        case ENET_100_MII:
-                *speed = ENET_SPEED_100BT;
-                break;
-        case ENET_100_RMII:
-                *speed = ENET_SPEED_100BT;
-                *rmm = 1;
-                break;
-        case ENET_100_RGMII:
-                *speed = ENET_SPEED_100BT;
-                *rpm = 1;
-                *limited_to_full_duplex = 1;
-                break;
-        case ENET_1000_GMII:
-                *speed = ENET_SPEED_1000BT;
-                *limited_to_full_duplex = 1;
-                break;
-        case ENET_1000_RGMII:
-                *speed = ENET_SPEED_1000BT;
-                *rpm = 1;
-                *limited_to_full_duplex = 1;
-                break;
-        case ENET_1000_TBI:
-                *speed = ENET_SPEED_1000BT;
-                *tbi = 1;
-                *limited_to_full_duplex = 1;
-                break;
-        case ENET_1000_RTBI:
-                *speed = ENET_SPEED_1000BT;
-                *rpm = 1;
-                *tbi = 1;
-                *limited_to_full_duplex = 1;
-                break;
-        default:
-                return -EINVAL;
-                break;
-        }
-
-        return 0;
-}
-
 static struct sk_buff *get_new_skb(struct ucc_geth_private *ugeth, u8 *bd)
 {
         struct sk_buff *skb = NULL;
@@ -758,24 +687,6 @@ static void dump_regs(struct ucc_geth_private *ugeth)
         ugeth_info("hafdup     : addr - 0x%08x, val - 0x%08x",
                    (u32) & ugeth->ug_regs->hafdup,
                    in_be32(&ugeth->ug_regs->hafdup));
-        ugeth_info("miimcfg    : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->miimng.miimcfg,
-                   in_be32(&ugeth->ug_regs->miimng.miimcfg));
-        ugeth_info("miimcom    : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->miimng.miimcom,
-                   in_be32(&ugeth->ug_regs->miimng.miimcom));
-        ugeth_info("miimadd    : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->miimng.miimadd,
-                   in_be32(&ugeth->ug_regs->miimng.miimadd));
-        ugeth_info("miimcon    : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->miimng.miimcon,
-                   in_be32(&ugeth->ug_regs->miimng.miimcon));
-        ugeth_info("miimstat   : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->miimng.miimstat,
-                   in_be32(&ugeth->ug_regs->miimng.miimstat));
-        ugeth_info("miimmind   : addr - 0x%08x, val - 0x%08x",
-                   (u32) & ugeth->ug_regs->miimng.miimind,
-                   in_be32(&ugeth->ug_regs->miimng.miimind));
         ugeth_info("ifctl      : addr - 0x%08x, val - 0x%08x",
                    (u32) & ugeth->ug_regs->ifctl,
                    in_be32(&ugeth->ug_regs->ifctl));
@@ -1425,27 +1336,6 @@ static int init_mac_station_addr_regs(u8 address_byte_0,
         return 0;
 }
 
-static int init_mac_duplex_mode(int full_duplex,
-                                int limited_to_full_duplex,
-                                volatile u32 *maccfg2_register)
-{
-        u32 value = 0;
-
-        /* some interfaces must work in full duplex mode */
-        if ((full_duplex == 0) && (limited_to_full_duplex == 1))
-                return -EINVAL;
-
-        value = in_be32(maccfg2_register);
-
-        if (full_duplex)
-                value |= MACCFG2_FDX;
-        else
-                value &= ~MACCFG2_FDX;
-
-        out_be32(maccfg2_register, value);
-        return 0;
-}
-
 static int init_check_frame_length_mode(int length_check,
                                         volatile u32 *maccfg2_register)
 {
@@ -1477,40 +1367,6 @@ static int init_preamble_length(u8 preamble_length,
         return 0;
 }
 
-static int init_mii_management_configuration(int reset_mgmt,
-                                             int preamble_supress,
-                                             volatile u32 *miimcfg_register,
-                                             volatile u32 *miimind_register)
-{
-        unsigned int timeout = PHY_INIT_TIMEOUT;
-        u32 value = 0;
-
-        value = in_be32(miimcfg_register);
-        if (reset_mgmt) {
-                value |= MIIMCFG_RESET_MANAGEMENT;
-                out_be32(miimcfg_register, value);
-        }
-
-        value = 0;
-
-        if (preamble_supress)
-                value |= MIIMCFG_NO_PREAMBLE;
-
-        value |= UCC_GETH_MIIMCFG_MNGMNT_CLC_DIV_INIT;
-        out_be32(miimcfg_register, value);
-
-        /* Wait until the bus is free */
-        while ((in_be32(miimind_register) & MIIMIND_BUSY) && timeout--)
-                cpu_relax();
-
-        if (timeout <= 0) {
-                ugeth_err("%s: The MII Bus is stuck!", __FUNCTION__);
-                return -ETIMEDOUT;
-        }
-
-        return 0;
-}
-
 static int init_rx_parameters(int reject_broadcast,
                               int receive_short_frames,
                               int promiscuous, volatile u32 *upsmr_register)
@@ -1570,10 +1426,8 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth)
         struct ucc_geth_info *ug_info;
         struct ucc_geth *ug_regs;
         struct ucc_fast *uf_regs;
-        enum enet_speed speed;
-        int ret_val, rpm = 0, tbi = 0, r10m = 0, rmm =
-            0, limited_to_full_duplex = 0;
-        u32 upsmr, maccfg2, utbipar, tbiBaseAddress;
+        int ret_val;
+        u32 upsmr, maccfg2, tbiBaseAddress;
         u16 value;
 
         ugeth_vdbg("%s: IN", __FUNCTION__);
@@ -1582,24 +1436,13 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth)
         ug_regs = ugeth->ug_regs;
         uf_regs = ugeth->uccf->uf_regs;
 
-        /* Analyze enet_interface according to Interface Mode Configuration
-        table */
-        ret_val =
-            get_interface_details(ug_info->enet_interface, &speed, &r10m, &rmm,
-                                  &rpm, &tbi, &limited_to_full_duplex);
-        if (ret_val != 0) {
-                ugeth_err
-                  ("%s: half duplex not supported in requested configuration.",
-                     __FUNCTION__);
-                return ret_val;
-        }
-
         /*                    Set MACCFG2                    */
         maccfg2 = in_be32(&ug_regs->maccfg2);
         maccfg2 &= ~MACCFG2_INTERFACE_MODE_MASK;
-        if ((speed == ENET_SPEED_10BT) || (speed == ENET_SPEED_100BT))
+        if ((ugeth->max_speed == SPEED_10) ||
+            (ugeth->max_speed == SPEED_100))
                 maccfg2 |= MACCFG2_INTERFACE_MODE_NIBBLE;
-        else if (speed == ENET_SPEED_1000BT)
+        else if (ugeth->max_speed == SPEED_1000)
                 maccfg2 |= MACCFG2_INTERFACE_MODE_BYTE;
         maccfg2 |= ug_info->padAndCrc;
         out_be32(&ug_regs->maccfg2, maccfg2);
@@ -1607,54 +1450,39 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth)
         /*                    Set UPSMR                      */
         upsmr = in_be32(&uf_regs->upsmr);
         upsmr &= ~(UPSMR_RPM | UPSMR_R10M | UPSMR_TBIM | UPSMR_RMM);
-        if (rpm)
+        if ((ugeth->phy_interface == PHY_INTERFACE_MODE_RMII) ||
+            (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII) ||
+            (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_ID) ||
+            (ugeth->phy_interface == PHY_INTERFACE_MODE_RTBI)) {
                 upsmr |= UPSMR_RPM;
-        if (r10m)
-                upsmr |= UPSMR_R10M;
-        if (tbi)
+                switch (ugeth->max_speed) {
+                case SPEED_10:
+                        upsmr |= UPSMR_R10M;
+                        /* FALLTHROUGH */
+                case SPEED_100:
+                        if (ugeth->phy_interface != PHY_INTERFACE_MODE_RTBI)
+                                upsmr |= UPSMR_RMM;
+                }
+        }
+        if ((ugeth->phy_interface == PHY_INTERFACE_MODE_TBI) ||
+            (ugeth->phy_interface == PHY_INTERFACE_MODE_RTBI)) {
                 upsmr |= UPSMR_TBIM;
-        if (rmm)
-                upsmr |= UPSMR_RMM;
+        }
         out_be32(&uf_regs->upsmr, upsmr);
 
-        /*                    Set UTBIPAR                    */
-        utbipar = in_be32(&ug_regs->utbipar);
-        utbipar &= ~UTBIPAR_PHY_ADDRESS_MASK;
-        if (tbi)
-                utbipar |=
-                    (ug_info->phy_address +
-                     ugeth->ug_info->uf_info.
-                     ucc_num) << UTBIPAR_PHY_ADDRESS_SHIFT;
-        else
-                utbipar |=
-                    (0x10 +
-                     ugeth->ug_info->uf_info.
-                     ucc_num) << UTBIPAR_PHY_ADDRESS_SHIFT;
-        out_be32(&ug_regs->utbipar, utbipar);
-
         /* Disable autonegotiation in tbi mode, because by default it
         comes up in autonegotiation mode. */
         /* Note that this depends on proper setting in utbipar register. */
-        if (tbi) {
+        if ((ugeth->phy_interface == PHY_INTERFACE_MODE_TBI) ||
+            (ugeth->phy_interface == PHY_INTERFACE_MODE_RTBI)) {
                 tbiBaseAddress = in_be32(&ug_regs->utbipar);
                 tbiBaseAddress &= UTBIPAR_PHY_ADDRESS_MASK;
                 tbiBaseAddress >>= UTBIPAR_PHY_ADDRESS_SHIFT;
-                value =
-                    ugeth->mii_info->mdio_read(ugeth->dev, (u8) tbiBaseAddress,
-                                               ENET_TBI_MII_CR);
+                value = ugeth->phydev->bus->read(ugeth->phydev->bus,
+                                (u8) tbiBaseAddress, ENET_TBI_MII_CR);
                 value &= ~0x1000;       /* Turn off autonegotiation */
-                ugeth->mii_info->mdio_write(ugeth->dev, (u8) tbiBaseAddress,
-                                            ENET_TBI_MII_CR, value);
-        }
-
-        ret_val = init_mac_duplex_mode(1,
-                                       limited_to_full_duplex,
-                                       &ug_regs->maccfg2);
-        if (ret_val != 0) {
-                ugeth_err
-                ("%s: half duplex not supported in requested configuration.",
-                     __FUNCTION__);
-                return ret_val;
+                ugeth->phydev->bus->write(ugeth->phydev->bus,
+                                (u8) tbiBaseAddress, ENET_TBI_MII_CR, value);
         }
 
         init_check_frame_length_mode(ug_info->lengthCheckRx, &ug_regs->maccfg2);
@@ -1676,76 +1504,88 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth)
  * function converts those variables into the appropriate
  * register values, and can bring down the device if needed.
  */
+
 static void adjust_link(struct net_device *dev)
 {
         struct ucc_geth_private *ugeth = netdev_priv(dev);
         struct ucc_geth *ug_regs;
-        u32 tempval;
-        struct ugeth_mii_info *mii_info = ugeth->mii_info;
+        struct ucc_fast *uf_regs;
+        struct phy_device *phydev = ugeth->phydev;
+        unsigned long flags;
+        int new_state = 0;
 
         ug_regs = ugeth->ug_regs;
+        uf_regs = ugeth->uccf->uf_regs;
 
-        if (mii_info->link) {
+        spin_lock_irqsave(&ugeth->lock, flags);
+
+        if (phydev->link) {
+                u32 tempval = in_be32(&ug_regs->maccfg2);
+                u32 upsmr = in_be32(&uf_regs->upsmr);
                 /* Now we make sure that we can be in full duplex mode.
                  * If not, we operate in half-duplex mode. */
-                if (mii_info->duplex != ugeth->oldduplex) {
-                        if (!(mii_info->duplex)) {
-                                tempval = in_be32(&ug_regs->maccfg2);
+                if (phydev->duplex != ugeth->oldduplex) {
+                        new_state = 1;
+                        if (!(phydev->duplex))
                                 tempval &= ~(MACCFG2_FDX);
-                                out_be32(&ug_regs->maccfg2, tempval);
-
-                                ugeth_info("%s: Half Duplex", dev->name);
-                        } else {
-                                tempval = in_be32(&ug_regs->maccfg2);
+                        else
                                 tempval |= MACCFG2_FDX;
-                                out_be32(&ug_regs->maccfg2, tempval);
-
-                                ugeth_info("%s: Full Duplex", dev->name);
-                        }
-
-                        ugeth->oldduplex = mii_info->duplex;
+                        ugeth->oldduplex = phydev->duplex;
                 }
 
-                if (mii_info->speed != ugeth->oldspeed) {
-                        switch (mii_info->speed) {
-                        case 1000:
-                                ugeth->ug_info->enet_interface = ENET_1000_RGMII;
+                if (phydev->speed != ugeth->oldspeed) {
+                        new_state = 1;
+                        switch (phydev->speed) {
+                        case SPEED_1000:
+                                tempval = ((tempval &
+                                            ~(MACCFG2_INTERFACE_MODE_MASK)) |
+                                            MACCFG2_INTERFACE_MODE_BYTE);
                                 break;
-                        case 100:
-                                ugeth->ug_info->enet_interface = ENET_100_RGMII;
-                                break;
-                        case 10:
-                                ugeth->ug_info->enet_interface = ENET_10_RGMII;
+                        case SPEED_100:
+                        case SPEED_10:
+                                tempval = ((tempval &
+                                            ~(MACCFG2_INTERFACE_MODE_MASK)) |
+                                            MACCFG2_INTERFACE_MODE_NIBBLE);
+                                /* if reduced mode, re-set UPSMR.R10M */
+                                if ((ugeth->phy_interface == PHY_INTERFACE_MODE_RMII) ||
+                                    (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII) ||
+                                    (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_ID) ||
+                                    (ugeth->phy_interface == PHY_INTERFACE_MODE_RTBI)) {
+                                        if (phydev->speed == SPEED_10)
+                                                upsmr |= UPSMR_R10M;
+                                        else
+                                                upsmr &= ~(UPSMR_R10M);
+                                }
                                 break;
                         default:
-                                ugeth_warn
-                                    ("%s: Ack!  Speed (%d) is not 10/100/1000!",
-                                     dev->name, mii_info->speed);
+                                if (netif_msg_link(ugeth))
+                                        ugeth_warn(
+                                                "%s: Ack!  Speed (%d) is not 10/100/1000!",
+                                                dev->name, phydev->speed);
                                 break;
                         }
-                        adjust_enet_interface(ugeth);
-
-                        ugeth_info("%s: Speed %dBT", dev->name,
-                                   mii_info->speed);
-
-                        ugeth->oldspeed = mii_info->speed;
+                        ugeth->oldspeed = phydev->speed;
                 }
 
+                out_be32(&ug_regs->maccfg2, tempval);
+                out_be32(&uf_regs->upsmr, upsmr);
+
                 if (!ugeth->oldlink) {
-                        ugeth_info("%s: Link is up", dev->name);
+                        new_state = 1;
                         ugeth->oldlink = 1;
-                        netif_carrier_on(dev);
                         netif_schedule(dev);
                 }
-        } else {
-                if (ugeth->oldlink) {
-                        ugeth_info("%s: Link is down", dev->name);
+        } else if (ugeth->oldlink) {
+                        new_state = 1;
                         ugeth->oldlink = 0;
                         ugeth->oldspeed = 0;
                         ugeth->oldduplex = -1;
-                        netif_carrier_off(dev);
-                }
         }
+
+        if (new_state && netif_msg_link(ugeth))
+                phy_print_status(phydev);
+
+        spin_unlock_irqrestore(&ugeth->lock, flags);
 }
 
 /* Configure the PHY for dev.
@@ -1753,102 +1593,40 @@ static void adjust_link(struct net_device *dev)
  */
 static int init_phy(struct net_device *dev)
 {
-        struct ucc_geth_private *ugeth = netdev_priv(dev);
-        struct phy_info *curphy;
-        struct ucc_mii_mng *mii_regs;
-        struct ugeth_mii_info *mii_info;
-        int err;
+        struct ucc_geth_private *priv = netdev_priv(dev);
+        struct phy_device *phydev;
+        char phy_id[BUS_ID_SIZE];
 
-        mii_regs = &ugeth->ug_regs->miimng;
+        priv->oldlink = 0;
+        priv->oldspeed = 0;
+        priv->oldduplex = -1;
 
-        ugeth->oldlink = 0;
-        ugeth->oldspeed = 0;
-        ugeth->oldduplex = -1;
+        snprintf(phy_id, BUS_ID_SIZE, PHY_ID_FMT, priv->ug_info->mdio_bus,
+                        priv->ug_info->phy_address);
 
-        mii_info = kmalloc(sizeof(struct ugeth_mii_info), GFP_KERNEL);
+        phydev = phy_connect(dev, phy_id, &adjust_link, 0, priv->phy_interface);
 
-        if (NULL == mii_info) {
-                ugeth_err("%s: Could not allocate mii_info", dev->name);
-                return -ENOMEM;
+        if (IS_ERR(phydev)) {
+                printk("%s: Could not attach to PHY\n", dev->name);
+                return PTR_ERR(phydev);
         }
 
-        mii_info->mii_regs = mii_regs;
-        mii_info->speed = SPEED_1000;
-        mii_info->duplex = DUPLEX_FULL;
-        mii_info->pause = 0;
-        mii_info->link = 0;
-
-        mii_info->advertising = (ADVERTISED_10baseT_Half |
+        phydev->supported &= (ADVERTISED_10baseT_Half |
                                  ADVERTISED_10baseT_Full |
                                  ADVERTISED_100baseT_Half |
-                                 ADVERTISED_100baseT_Full |
-                                 ADVERTISED_1000baseT_Full);
-        mii_info->autoneg = 1;
+                                 ADVERTISED_100baseT_Full);
 
-        mii_info->mii_id = ugeth->ug_info->phy_address;
+        if (priv->max_speed == SPEED_1000)
+                phydev->supported |= ADVERTISED_1000baseT_Full;
 
-        mii_info->dev = dev;
+        phydev->advertising = phydev->supported;
 
-        mii_info->mdio_read = &read_phy_reg;
-        mii_info->mdio_write = &write_phy_reg;
-
-        spin_lock_init(&mii_info->mdio_lock);
-
-        ugeth->mii_info = mii_info;
-
-        spin_lock_irq(&ugeth->lock);
-
-        /* Set this UCC to be the master of the MII managment */
-        ucc_set_qe_mux_mii_mng(ugeth->ug_info->uf_info.ucc_num);
-
-        if (init_mii_management_configuration(1,
-                                              ugeth->ug_info->
-                                              miiPreambleSupress,
-                                              &mii_regs->miimcfg,
-                                              &mii_regs->miimind)) {
-                ugeth_err("%s: The MII Bus is stuck!", dev->name);
-                err = -1;
-                goto bus_fail;
-        }
-
-        spin_unlock_irq(&ugeth->lock);
-
-        /* get info for this PHY */
-        curphy = get_phy_info(ugeth->mii_info);
-
-        if (curphy == NULL) {
-                ugeth_err("%s: No PHY found", dev->name);
-                err = -1;
-                goto no_phy;
-        }
-
-        mii_info->phyinfo = curphy;
-
-        /* Run the commands which initialize the PHY */
-        if (curphy->init) {
-                err = curphy->init(ugeth->mii_info);
-                if (err)
-                        goto phy_init_fail;
-        }
+        priv->phydev = phydev;
 
         return 0;
-
-      phy_init_fail:
-      no_phy:
-      bus_fail:
-        kfree(mii_info);
-
-        return err;
 }
 
-#ifdef CONFIG_UGETH_TX_ON_DEMOND
-static int ugeth_transmit_on_demand(struct ucc_geth_private *ugeth)
-{
-        struct ucc_fastransmit_on_demand(ugeth->uccf);
 
-        return 0;
-}
-#endif
 
 static int ugeth_graceful_stop_tx(struct ucc_geth_private *ugeth)
 {
@@ -2356,6 +2134,8 @@ static void ucc_geth_memclean(struct ucc_geth_private *ugeth)
         }
         for (i = 0; i < ugeth->ug_info->numQueuesTx; i++) {
                 bd = ugeth->p_tx_bd_ring[i];
+                if (!bd)
+                        continue;
                 for (j = 0; j < ugeth->ug_info->bdRingLenTx[i]; j++) {
                         if (ugeth->tx_skbuff[i][j]) {
                                 dma_unmap_single(NULL,
@@ -2487,6 +2267,7 @@ static void ucc_geth_set_multi(struct net_device *dev)
 static void ucc_geth_stop(struct ucc_geth_private *ugeth)
 {
         struct ucc_geth *ug_regs = ugeth->ug_regs;
+        struct phy_device *phydev = ugeth->phydev;
         u32 tempval;
 
         ugeth_vdbg("%s: IN", __FUNCTION__);
@@ -2495,8 +2276,7 @@ static void ucc_geth_stop(struct ucc_geth_private *ugeth)
         ugeth_disable(ugeth, COMM_DIR_RX_AND_TX);
 
         /* Tell the kernel the link is down */
-        ugeth->mii_info->link = 0;
-        adjust_link(ugeth->dev);
+        phy_stop(phydev);
 
         /* Mask all interrupts */
         out_be32(ugeth->uccf->p_ucce, 0x00000000);
@@ -2509,50 +2289,24 @@ static void ucc_geth_stop(struct ucc_geth_private *ugeth)
         tempval &= ~(MACCFG1_ENABLE_RX | MACCFG1_ENABLE_TX);
         out_be32(&ug_regs->maccfg1, tempval);
 
-        if (ugeth->ug_info->board_flags & FSL_UGETH_BRD_HAS_PHY_INTR) {
-                /* Clear any pending interrupts */
-                mii_clear_phy_interrupt(ugeth->mii_info);
-
-                /* Disable PHY Interrupts */
-                mii_configure_phy_interrupt(ugeth->mii_info,
-                                            MII_INTERRUPT_DISABLED);
-        }
-
         free_irq(ugeth->ug_info->uf_info.irq, ugeth->dev);
 
-        if (ugeth->ug_info->board_flags & FSL_UGETH_BRD_HAS_PHY_INTR) {
-                free_irq(ugeth->ug_info->phy_interrupt, ugeth->dev);
-        } else {
-                del_timer_sync(&ugeth->phy_info_timer);
-        }
-
         ucc_geth_memclean(ugeth);
 }
 
-static int ucc_geth_startup(struct ucc_geth_private *ugeth)
+static int ucc_struct_init(struct ucc_geth_private *ugeth)
 {
-        struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt;
-        struct ucc_geth_init_pram *p_init_enet_pram;
-        struct ucc_fast_private *uccf;
         struct ucc_geth_info *ug_info;
         struct ucc_fast_info *uf_info;
-        struct ucc_fast *uf_regs;
-        struct ucc_geth *ug_regs;
-        int ret_val = -EINVAL;
-        u32 remoder = UCC_GETH_REMODER_INIT;
-        u32 init_enet_pram_offset, cecr_subblock, command, maccfg1;
-        u32 ifstat, i, j, size, l2qt, l3qt, length;
-        u16 temoder = UCC_GETH_TEMODER_INIT;
-        u16 test;
-        u8 function_code = 0;
-        u8 *bd, *endOfRing;
-        u8 numThreadsRxNumerical, numThreadsTxNumerical;
-
-        ugeth_vdbg("%s: IN", __FUNCTION__);
+        int i;
 
         ug_info = ugeth->ug_info;
         uf_info = &ug_info->uf_info;
 
+        /* Create CQs for hash tables */
+        INIT_LIST_HEAD(&ugeth->group_hash_q);
+        INIT_LIST_HEAD(&ugeth->ind_hash_q);
+
         if (!((uf_info->bd_mem_part == MEM_PART_SYSTEM) ||
               (uf_info->bd_mem_part == MEM_PART_MURAM))) {
                 ugeth_err("%s: Bad memory partition value.", __FUNCTION__);
@@ -2647,12 +2401,42 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
         for (i = 0; i < ug_info->numQueuesTx; i++)
                 uf_info->uccm_mask |= (UCCE_TXBF_SINGLE_MASK << i);
         /* Initialize the general fast UCC block. */
-        if (ucc_fast_init(uf_info, &uccf)) {
+        if (ucc_fast_init(uf_info, &ugeth->uccf)) {
                 ugeth_err("%s: Failed to init uccf.", __FUNCTION__);
                 ucc_geth_memclean(ugeth);
                 return -ENOMEM;
         }
-        ugeth->uccf = uccf;
+
+        ugeth->ug_regs = (struct ucc_geth *) ioremap(uf_info->regs, sizeof(struct ucc_geth));
+
+        return 0;
+}
+
+static int ucc_geth_startup(struct ucc_geth_private *ugeth)
+{
+        struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt;
+        struct ucc_geth_init_pram *p_init_enet_pram;
+        struct ucc_fast_private *uccf;
+        struct ucc_geth_info *ug_info;
+        struct ucc_fast_info *uf_info;
+        struct ucc_fast *uf_regs;
+        struct ucc_geth *ug_regs;
+        int ret_val = -EINVAL;
+        u32 remoder = UCC_GETH_REMODER_INIT;
+        u32 init_enet_pram_offset, cecr_subblock, command, maccfg1;
+        u32 ifstat, i, j, size, l2qt, l3qt, length;
+        u16 temoder = UCC_GETH_TEMODER_INIT;
+        u16 test;
+        u8 function_code = 0;
+        u8 *bd, *endOfRing;
+        u8 numThreadsRxNumerical, numThreadsTxNumerical;
+
+        ugeth_vdbg("%s: IN", __FUNCTION__);
+        uccf = ugeth->uccf;
+        ug_info = ugeth->ug_info;
+        uf_info = &ug_info->uf_info;
+        uf_regs = uccf->uf_regs;
+        ug_regs = ugeth->ug_regs;
 
         switch (ug_info->numThreadsRx) {
         case UCC_GETH_NUM_OF_THREADS_1:
@@ -2711,10 +2495,6 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
             || (ug_info->vlanOperationNonTagged !=
                 UCC_GETH_VLAN_OPERATION_NON_TAGGED_NOP);
 
-        uf_regs = uccf->uf_regs;
-        ug_regs = (struct ucc_geth *) (uccf->uf_regs);
-        ugeth->ug_regs = ug_regs;
-
         init_default_reg_vals(&uf_regs->upsmr,
                               &ug_regs->maccfg1, &ug_regs->maccfg2);
 
@@ -3177,8 +2957,8 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
         /* Size varies with number of Rx queues */
         ugeth->rx_irq_coalescing_tbl_offset =
             qe_muram_alloc(ug_info->numQueuesRx *
-                           sizeof(struct ucc_geth_rx_interrupt_coalescing_entry),
-                           UCC_GETH_RX_INTERRUPT_COALESCING_ALIGNMENT);
+                           sizeof(struct ucc_geth_rx_interrupt_coalescing_entry)
+                           + 4, UCC_GETH_RX_INTERRUPT_COALESCING_ALIGNMENT);
         if (IS_MURAM_ERR(ugeth->rx_irq_coalescing_tbl_offset)) {
                 ugeth_err
                     ("%s: Can not allocate DPRAM memory for"
@@ -3359,13 +3139,6 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 for (j = 0; j < NUM_OF_PADDRS; j++)
                         ugeth_82xx_filtering_clear_addr_in_paddr(ugeth, (u8) j);
 
-                /* Create CQs for hash tables */
-                if (ug_info->maxGroupAddrInHash > 0) {
-                        INIT_LIST_HEAD(&ugeth->group_hash_q);
-                }
-                if (ug_info->maxIndAddrInHash > 0) {
-                        INIT_LIST_HEAD(&ugeth->ind_hash_q);
-                }
                 p_82xx_addr_filt =
                     (struct ucc_geth_82xx_address_filtering_pram *) ugeth->
                     p_rx_glbl_pram->addressfiltering;
@@ -3562,6 +3335,9 @@ static void ucc_geth_timeout(struct net_device *dev)
 static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct ucc_geth_private *ugeth = netdev_priv(dev);
+#ifdef CONFIG_UGETH_TX_ON_DEMAND
+        struct ucc_fast_private *uccf;
+#endif
         u8 *bd;                 /* BD pointer */
         u32 bd_status;
         u8 txQ = 0;
@@ -3620,6 +3396,10 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 out_be16(ugeth->p_cpucount[txQ], ugeth->cpucount[txQ]);
         }
 
+#ifdef CONFIG_UGETH_TX_ON_DEMAND
+        uccf = ugeth->uccf;
+        out_be16(uccf->p_utodr, UCC_FAST_TOD);
+#endif
         spin_unlock_irq(&ugeth->lock);
 
         return 0;
@@ -3635,7 +3415,6 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit
 
         ugeth_vdbg("%s: IN", __FUNCTION__);
 
-        spin_lock(&ugeth->lock);
         /* collect received buffers */
         bd = ugeth->rxBd[rxQ];
 
@@ -3683,7 +3462,6 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit
                 skb = get_new_skb(ugeth, bd);
                 if (!skb) {
                         ugeth_warn("%s: No Rx Data Buffer", __FUNCTION__);
-                        spin_unlock(&ugeth->lock);
                         ugeth->stats.rx_dropped++;
                         break;
                 }
@@ -3704,7 +3482,6 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit
         }
 
         ugeth->rxBd[rxQ] = bd;
-        spin_unlock(&ugeth->lock);
         return howmany;
 }
 
@@ -3756,23 +3533,38 @@ static int ucc_geth_tx(struct net_device *dev, u8 txQ)
 static int ucc_geth_poll(struct net_device *dev, int *budget)
 {
         struct ucc_geth_private *ugeth = netdev_priv(dev);
+        struct ucc_geth_info *ug_info;
+        struct ucc_fast_private *uccf;
         int howmany;
-        int rx_work_limit = *budget;
-        u8 rxQ = 0;
+        u8 i;
+        int rx_work_limit;
+        register u32 uccm;
+
+        ug_info = ugeth->ug_info;
 
+        rx_work_limit = *budget;
         if (rx_work_limit > dev->quota)
                 rx_work_limit = dev->quota;
 
-        howmany = ucc_geth_rx(ugeth, rxQ, rx_work_limit);
+        howmany = 0;
+
+        for (i = 0; i < ug_info->numQueuesRx; i++) {
+                howmany += ucc_geth_rx(ugeth, i, rx_work_limit);
+        }
 
         dev->quota -= howmany;
         rx_work_limit -= howmany;
         *budget -= howmany;
 
-        if (rx_work_limit >= 0)
+        if (rx_work_limit > 0) {
                 netif_rx_complete(dev);
+                uccf = ugeth->uccf;
+                uccm = in_be32(uccf->p_uccm);
+                uccm |= UCCE_RX_EVENTS;
+                out_be32(uccf->p_uccm, uccm);
+        }
 
-        return (rx_work_limit < 0) ? 1 : 0;
+        return (rx_work_limit > 0) ? 0 : 1;
 }
 #endif                          /* CONFIG_UGETH_NAPI */
 
@@ -3782,10 +3574,13 @@ static irqreturn_t ucc_geth_irq_handler(int irq, void *info)
         struct ucc_geth_private *ugeth = netdev_priv(dev);
         struct ucc_fast_private *uccf;
         struct ucc_geth_info *ug_info;
-        register u32 ucce = 0;
-        register u32 bit_mask = UCCE_RXBF_SINGLE_MASK;
-        register u32 tx_mask = UCCE_TXBF_SINGLE_MASK;
-        register u8 i;
+        register u32 ucce;
+        register u32 uccm;
+#ifndef CONFIG_UGETH_NAPI
+        register u32 rx_mask;
+#endif
+        register u32 tx_mask;
+        u8 i;
 
         ugeth_vdbg("%s: IN", __FUNCTION__);
 
@@ -3795,174 +3590,57 @@ static irqreturn_t ucc_geth_irq_handler(int irq, void *info)
         uccf = ugeth->uccf;
         ug_info = ugeth->ug_info;
 
-        do {
-                ucce |= (u32) (in_be32(uccf->p_ucce) & in_be32(uccf->p_uccm));
-
-                /* clear event bits for next time */
-                /* Side effect here is to mask ucce variable
-                for future processing below. */
-                out_be32(uccf->p_ucce, ucce);   /* Clear with ones,
-                                                but only bits in UCCM */
-
-                /* We ignore Tx interrupts because Tx confirmation is
-                done inside Tx routine */
+        /* read and clear events */
+        ucce = (u32) in_be32(uccf->p_ucce);
+        uccm = (u32) in_be32(uccf->p_uccm);
+        ucce &= uccm;
+        out_be32(uccf->p_ucce, ucce);
 
+        /* check for receive events that require processing */
+        if (ucce & UCCE_RX_EVENTS) {
+#ifdef CONFIG_UGETH_NAPI
+                if (netif_rx_schedule_prep(dev)) {
+                uccm &= ~UCCE_RX_EVENTS;
+                        out_be32(uccf->p_uccm, uccm);
+                        __netif_rx_schedule(dev);
+                }
+#else
+                rx_mask = UCCE_RXBF_SINGLE_MASK;
                 for (i = 0; i < ug_info->numQueuesRx; i++) {
-                        if (ucce & bit_mask)
-                                ucc_geth_rx(ugeth, i,
-                                            (int)ugeth->ug_info->
-                                            bdRingLenRx[i]);
-                        ucce &= ~bit_mask;
-                        bit_mask <<= 1;
+                        if (ucce & rx_mask)
+                                ucc_geth_rx(ugeth, i, (int)ugeth->ug_info->bdRingLenRx[i]);
+                        ucce &= ~rx_mask;
+                        rx_mask <<= 1;
                 }
+#endif /* CONFIG_UGETH_NAPI */
+        }
 
+        /* Tx event processing */
+        if (ucce & UCCE_TX_EVENTS) {
+                spin_lock(&ugeth->lock);
+                tx_mask = UCCE_TXBF_SINGLE_MASK;
                 for (i = 0; i < ug_info->numQueuesTx; i++) {
                         if (ucce & tx_mask)
                                 ucc_geth_tx(dev, i);
                         ucce &= ~tx_mask;
                         tx_mask <<= 1;
                 }
+                spin_unlock(&ugeth->lock);
+        }
 
-                /* Exceptions */
+        /* Errors and other events */
+        if (ucce & UCCE_OTHER) {
                 if (ucce & UCCE_BSY) {
-                        ugeth_vdbg("Got BUSY irq!!!!");
                         ugeth->stats.rx_errors++;
-                        ucce &= ~UCCE_BSY;
                 }
-                if (ucce & UCCE_OTHER) {
-                        ugeth_vdbg("Got frame with error (ucce - 0x%08x)!!!!",
-                                   ucce);
-                        ugeth->stats.rx_errors++;
-                        ucce &= ~ucce;
+                if (ucce & UCCE_TXE) {
+                        ugeth->stats.tx_errors++;
                 }
         }
-        while (ucce);
-
-        return IRQ_HANDLED;
-}
-
-static irqreturn_t phy_interrupt(int irq, void *dev_id)
-{
-        struct net_device *dev = (struct net_device *)dev_id;
-        struct ucc_geth_private *ugeth = netdev_priv(dev);
-
-        ugeth_vdbg("%s: IN", __FUNCTION__);
-
-        /* Clear the interrupt */
-        mii_clear_phy_interrupt(ugeth->mii_info);
-
-        /* Disable PHY interrupts */
-        mii_configure_phy_interrupt(ugeth->mii_info, MII_INTERRUPT_DISABLED);
-
-        /* Schedule the phy change */
-        schedule_work(&ugeth->tq);
 
         return IRQ_HANDLED;
 }
 
-/* Scheduled by the phy_interrupt/timer to handle PHY changes */
-static void ugeth_phy_change(struct work_struct *work)
-{
-        struct ucc_geth_private *ugeth =
-                container_of(work, struct ucc_geth_private, tq);
-        struct net_device *dev = ugeth->dev;
-        struct ucc_geth *ug_regs;
-        int result = 0;
-
-        ugeth_vdbg("%s: IN", __FUNCTION__);
-
-        ug_regs = ugeth->ug_regs;
-
-        /* Delay to give the PHY a chance to change the
-         * register state */
-        msleep(1);
-
-        /* Update the link, speed, duplex */
-        result = ugeth->mii_info->phyinfo->read_status(ugeth->mii_info);
-
-        /* Adjust the known status as long as the link
-         * isn't still coming up */
-        if ((0 == result) || (ugeth->mii_info->link == 0))
-                adjust_link(dev);
-
-        /* Reenable interrupts, if needed */
-        if (ugeth->ug_info->board_flags & FSL_UGETH_BRD_HAS_PHY_INTR)
-                mii_configure_phy_interrupt(ugeth->mii_info,
-                                            MII_INTERRUPT_ENABLED);
-}
-
-/* Called every so often on systems that don't interrupt
- * the core for PHY changes */
-static void ugeth_phy_timer(unsigned long data)
-{
-        struct net_device *dev = (struct net_device *)data;
-        struct ucc_geth_private *ugeth = netdev_priv(dev);
-
-        schedule_work(&ugeth->tq);
-
-        mod_timer(&ugeth->phy_info_timer, jiffies + PHY_CHANGE_TIME * HZ);
-}
-
-/* Keep trying aneg for some time
- * If, after GFAR_AN_TIMEOUT seconds, it has not
- * finished, we switch to forced.
- * Either way, once the process has completed, we either
- * request the interrupt, or switch the timer over to
- * using ugeth_phy_timer to check status */
-static void ugeth_phy_startup_timer(unsigned long data)
-{
-        struct ugeth_mii_info *mii_info = (struct ugeth_mii_info *)data;
-        struct ucc_geth_private *ugeth = netdev_priv(mii_info->dev);
-        static int secondary = UGETH_AN_TIMEOUT;
-        int result;
-
-        /* Configure the Auto-negotiation */
-        result = mii_info->phyinfo->config_aneg(mii_info);
-
-        /* If autonegotiation failed to start, and
-         * we haven't timed out, reset the timer, and return */
-        if (result && secondary--) {
-                mod_timer(&ugeth->phy_info_timer, jiffies + HZ);
-                return;
-        } else if (result) {
-                /* Couldn't start autonegotiation.
-                 * Try switching to forced */
-                mii_info->autoneg = 0;
-                result = mii_info->phyinfo->config_aneg(mii_info);
-
-                /* Forcing failed!  Give up */
-                if (result) {
-                        ugeth_err("%s: Forcing failed!", mii_info->dev->name);
-                        return;
-                }
-        }
-
-        /* Kill the timer so it can be restarted */
-        del_timer_sync(&ugeth->phy_info_timer);
-
-        /* Grab the PHY interrupt, if necessary/possible */
-        if (ugeth->ug_info->board_flags & FSL_UGETH_BRD_HAS_PHY_INTR) {
-                if (request_irq(ugeth->ug_info->phy_interrupt,
-                                phy_interrupt, IRQF_SHARED,
-                                "phy_interrupt", mii_info->dev) < 0) {
-                        ugeth_err("%s: Can't get IRQ %d (PHY)",
-                                  mii_info->dev->name,
-                                  ugeth->ug_info->phy_interrupt);
-                } else {
-                        mii_configure_phy_interrupt(ugeth->mii_info,
-                                                    MII_INTERRUPT_ENABLED);
-                        return;
-                }
-        }
-
-        /* Start the timer again, this time in order to
-         * handle a change in status */
-        init_timer(&ugeth->phy_info_timer);
-        ugeth->phy_info_timer.function = &ugeth_phy_timer;
-        ugeth->phy_info_timer.data = (unsigned long)mii_info->dev;
-        mod_timer(&ugeth->phy_info_timer, jiffies + PHY_CHANGE_TIME * HZ);
-}
-
 /* Called when something needs to use the ethernet device */
 /* Returns 0 for success. */
 static int ucc_geth_open(struct net_device *dev)
@@ -3979,6 +3657,12 @@ static int ucc_geth_open(struct net_device *dev)
                 return -EINVAL;
         }
 
+        err = ucc_struct_init(ugeth);
+        if (err) {
+                ugeth_err("%s: Cannot configure internal struct, aborting.", dev->name);
+                return err;
+        }
+
         err = ucc_geth_startup(ugeth);
         if (err) {
                 ugeth_err("%s: Cannot configure net device, aborting.",
@@ -4006,10 +3690,12 @@ static int ucc_geth_open(struct net_device *dev)
 
         err = init_phy(dev);
         if (err) {
-                ugeth_err("%s: Cannot initialzie PHY, aborting.", dev->name);
+                ugeth_err("%s: Cannot initialize PHY, aborting.", dev->name);
                 return err;
         }
-#ifndef CONFIG_UGETH_NAPI
+
+        phy_start(ugeth->phydev);
+
         err =
             request_irq(ugeth->ug_info->uf_info.irq, ucc_geth_irq_handler, 0,
                         "UCC Geth", dev);
@@ -4019,15 +3705,6 @@ static int ucc_geth_open(struct net_device *dev)
                 ucc_geth_stop(ugeth);
                 return err;
         }
-#endif                          /* CONFIG_UGETH_NAPI */
-
-        /* Set up the PHY change work queue */
-        INIT_WORK(&ugeth->tq, ugeth_phy_change);
-
-        init_timer(&ugeth->phy_info_timer);
-        ugeth->phy_info_timer.function = &ugeth_phy_startup_timer;
-        ugeth->phy_info_timer.data = (unsigned long)ugeth->mii_info;
-        mod_timer(&ugeth->phy_info_timer, jiffies + HZ);
 
         err = ugeth_enable(ugeth, COMM_DIR_RX_AND_TX);
         if (err) {
@@ -4050,11 +3727,8 @@ static int ucc_geth_close(struct net_device *dev)
 
         ucc_geth_stop(ugeth);
 
-        /* Shutdown the PHY */
-        if (ugeth->mii_info->phyinfo->close)
-                ugeth->mii_info->phyinfo->close(ugeth->mii_info);
-
-        kfree(ugeth->mii_info);
+        phy_disconnect(ugeth->phydev);
+        ugeth->phydev = NULL;
 
         netif_stop_queue(dev);
 
@@ -4063,20 +3737,53 @@ static int ucc_geth_close(struct net_device *dev)
 
 const struct ethtool_ops ucc_geth_ethtool_ops = { };
 
+static phy_interface_t to_phy_interface(const char *interface_type)
+{
+        if (strcasecmp(interface_type, "mii") == 0)
+                return PHY_INTERFACE_MODE_MII;
+        if (strcasecmp(interface_type, "gmii") == 0)
+                return PHY_INTERFACE_MODE_GMII;
+        if (strcasecmp(interface_type, "tbi") == 0)
+                return PHY_INTERFACE_MODE_TBI;
+        if (strcasecmp(interface_type, "rmii") == 0)
+                return PHY_INTERFACE_MODE_RMII;
+        if (strcasecmp(interface_type, "rgmii") == 0)
+                return PHY_INTERFACE_MODE_RGMII;
+        if (strcasecmp(interface_type, "rgmii-id") == 0)
+                return PHY_INTERFACE_MODE_RGMII_ID;
+        if (strcasecmp(interface_type, "rtbi") == 0)
+                return PHY_INTERFACE_MODE_RTBI;
+
+        return PHY_INTERFACE_MODE_MII;
+}
+
 static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *match)
 {
         struct device *device = &ofdev->dev;
         struct device_node *np = ofdev->node;
+        struct device_node *mdio;
         struct net_device *dev = NULL;
         struct ucc_geth_private *ugeth = NULL;
         struct ucc_geth_info *ug_info;
         struct resource res;
         struct device_node *phy;
-        int err, ucc_num, phy_interface;
-        static int mii_mng_configured = 0;
+        int err, ucc_num, max_speed = 0;
         const phandle *ph;
         const unsigned int *prop;
         const void *mac_addr;
+        phy_interface_t phy_interface;
+        static const int enet_to_speed[] = {
+                SPEED_10, SPEED_10, SPEED_10,
+                SPEED_100, SPEED_100, SPEED_100,
+                SPEED_1000, SPEED_1000, SPEED_1000, SPEED_1000,
+        };
+        static const phy_interface_t enet_to_phy_interface[] = {
+                PHY_INTERFACE_MODE_MII, PHY_INTERFACE_MODE_RMII,
+                PHY_INTERFACE_MODE_RGMII, PHY_INTERFACE_MODE_MII,
+                PHY_INTERFACE_MODE_RMII, PHY_INTERFACE_MODE_RGMII,
+                PHY_INTERFACE_MODE_GMII, PHY_INTERFACE_MODE_RGMII,
+                PHY_INTERFACE_MODE_TBI, PHY_INTERFACE_MODE_RTBI,
+        };
 
         ugeth_vdbg("%s: IN", __FUNCTION__);
 
@@ -4087,6 +3794,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
 
         ug_info = &ugeth_info[ucc_num];
         ug_info->uf_info.ucc_num = ucc_num;
+
         prop = get_property(np, "rx-clock", NULL);
         ug_info->uf_info.rx_clock = *prop;
         prop = get_property(np, "tx-clock", NULL);
@@ -4104,13 +3812,72 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
         if (phy == NULL)
                 return -ENODEV;
 
+        /* set the PHY address */
         prop = get_property(phy, "reg", NULL);
+        if (prop == NULL)
+                return -1;
         ug_info->phy_address = *prop;
-        prop = get_property(phy, "interface", NULL);
-        ug_info->enet_interface = *prop;
-        ug_info->phy_interrupt = irq_of_parse_and_map(phy, 0);
-        ug_info->board_flags = (ug_info->phy_interrupt == NO_IRQ)?
-                        0:FSL_UGETH_BRD_HAS_PHY_INTR;
+
+        /* get the phy interface type, or default to MII */
+        prop = get_property(np, "interface-type", NULL);
+        if (!prop) {
+                /* handle interface property present in old trees */
+                prop = get_property(phy, "interface", NULL);
+                if (prop != NULL)
+                        phy_interface = enet_to_phy_interface[*prop];
+                else
+                        phy_interface = PHY_INTERFACE_MODE_MII;
+        } else {
+                phy_interface = to_phy_interface((const char *)prop);
+        }
+
+        /* get speed, or derive from interface */
+        prop = get_property(np, "max-speed", NULL);
+        if (!prop) {
+                /* handle interface property present in old trees */
+                prop = get_property(phy, "interface", NULL);
+                if (prop != NULL)
+                        max_speed = enet_to_speed[*prop];
+        } else {
+                max_speed = *prop;
+        }
+        if (!max_speed) {
+                switch (phy_interface) {
+                case PHY_INTERFACE_MODE_GMII:
+                case PHY_INTERFACE_MODE_RGMII:
+                case PHY_INTERFACE_MODE_RGMII_ID:
+                case PHY_INTERFACE_MODE_TBI:
+                case PHY_INTERFACE_MODE_RTBI:
+                        max_speed = SPEED_1000;
+                        break;
+                default:
+                        max_speed = SPEED_100;
+                        break;
+                }
+        }
+
+        if (max_speed == SPEED_1000) {
+                ug_info->uf_info.urfs = UCC_GETH_URFS_GIGA_INIT;
+                ug_info->uf_info.urfet = UCC_GETH_URFET_GIGA_INIT;
+                ug_info->uf_info.urfset = UCC_GETH_URFSET_GIGA_INIT;
+                ug_info->uf_info.utfs = UCC_GETH_UTFS_GIGA_INIT;
+                ug_info->uf_info.utfet = UCC_GETH_UTFET_GIGA_INIT;
+                ug_info->uf_info.utftt = UCC_GETH_UTFTT_GIGA_INIT;
+        }
+
+        /* Set the bus id */
+        mdio = of_get_parent(phy);
+
+        if (mdio == NULL)
+                return -1;
+
+        err = of_address_to_resource(mdio, 0, &res);
+        of_node_put(mdio);
+
+        if (err)
+                return -1;
+
+        ug_info->mdio_bus = res.start;
 
         printk(KERN_INFO "ucc_geth: UCC%1d at 0x%8x (irq = %d) \n",
                 ug_info->uf_info.ucc_num + 1, ug_info->uf_info.regs,
@@ -4122,43 +3889,6 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
                 return -ENODEV;
         }
 
-        /* FIXME: Work around for early chip rev.               */
-        /* There's a bug in initial chip rev(s) in the RGMII ac */
-        /* timing.                                              */
-        /* The following compensates by writing to the reserved */
-        /* QE Port Output Hold Registers (CPOH1?).              */
-        prop = get_property(phy, "interface", NULL);
-        phy_interface = *prop;
-        if ((phy_interface == ENET_1000_RGMII) ||
-                        (phy_interface == ENET_100_RGMII) ||
-                        (phy_interface == ENET_10_RGMII)) {
-                struct device_node *soc;
-                phys_addr_t immrbase = -1;
-                u32 *tmp_reg;
-                u32 tmp_val;
-
-                soc = of_find_node_by_type(NULL, "soc");
-                if (soc) {
-                        unsigned int size;
-                        const void *prop = get_property(soc, "reg", &size);
-                        immrbase = of_translate_address(soc, prop);
-                        of_node_put(soc);
-                };
-
-                tmp_reg = (u32 *) ioremap(immrbase + 0x14A8, 0x4);
-                tmp_val = in_be32(tmp_reg);
-                if (ucc_num == 1)
-                        out_be32(tmp_reg, tmp_val | 0x00003000);
-                else if (ucc_num == 2)
-                        out_be32(tmp_reg, tmp_val | 0x0c000000);
-                iounmap(tmp_reg);
-        }
-
-        if (!mii_mng_configured) {
-                ucc_set_qe_mux_mii_mng(ucc_num);
-                mii_mng_configured = 1;
-        }
-
         /* Create an ethernet device instance */
         dev = alloc_etherdev(sizeof(*ugeth));
 
@@ -4192,6 +3922,10 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
         dev->set_multicast_list = ucc_geth_set_multi;
         dev->ethtool_ops = &ucc_geth_ethtool_ops;
 
+        ugeth->msg_enable = (NETIF_MSG_IFUP << 1 ) - 1;
+        ugeth->phy_interface = phy_interface;
+        ugeth->max_speed = max_speed;
+
         err = register_netdev(dev);
         if (err) {
                 ugeth_err("%s: Cannot register net device, aborting.",
@@ -4200,13 +3934,13 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
                 return err;
         }
 
-        ugeth->ug_info = ug_info;
-        ugeth->dev = dev;
-
         mac_addr = of_get_mac_address(np);
         if (mac_addr)
                 memcpy(dev->dev_addr, mac_addr, 6);
 
+        ugeth->ug_info = ug_info;
+        ugeth->dev = dev;
+
         return 0;
 }
 
@@ -4242,19 +3976,30 @@ static struct of_platform_driver ucc_geth_driver = {
 
 static int __init ucc_geth_init(void)
 {
-        int i;
+        int i, ret;
+
+        ret = uec_mdio_init();
+
+        if (ret)
+                return ret;
 
         printk(KERN_INFO "ucc_geth: " DRV_DESC "\n");
         for (i = 0; i < 8; i++)
                 memcpy(&(ugeth_info[i]), &ugeth_primary_info,
                        sizeof(ugeth_primary_info));
 
-        return of_register_platform_driver(&ucc_geth_driver);
+        ret = of_register_platform_driver(&ucc_geth_driver);
+
+        if (ret)
+                uec_mdio_exit();
+
+        return ret;
 }
 
 static void __exit ucc_geth_exit(void)
 {
         of_unregister_platform_driver(&ucc_geth_driver);
+        uec_mdio_exit();
 }
 
 module_init(ucc_geth_init);
@@ -4262,4 +4007,5 @@ module_exit(ucc_geth_exit);
 
 MODULE_AUTHOR("Freescale Semiconductor, Inc");
 MODULE_DESCRIPTION(DRV_DESC);
+MODULE_VERSION(DRV_VERSION);
 MODULE_LICENSE("GPL");