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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 153 insertions, 109 deletions

diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index 012613fde3f4..6c019e148546 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -1,13 +1,18 @@
 /*
  * Blackfin On-Chip MAC Driver
  *
- * Copyright 2004-2007 Analog Devices Inc.
+ * Copyright 2004-2010 Analog Devices Inc.
  *
  * Enter bugs at http://blackfin.uclinux.org/
  *
  * Licensed under the GPL-2 or later.
  */
 
+#define DRV_VERSION     "1.1"
+#define DRV_DESC        "Blackfin on-chip Ethernet MAC driver"
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -23,7 +28,6 @@
 #include <linux/device.h>
 #include <linux/spinlock.h>
 #include <linux/mii.h>
-#include <linux/phy.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
@@ -38,27 +42,23 @@
 #include <asm/blackfin.h>
 #include <asm/cacheflush.h>
 #include <asm/portmux.h>
+#include <mach/pll.h>
 
 #include "bfin_mac.h"
 
-#define DRV_NAME        "bfin_mac"
-#define DRV_VERSION     "1.1"
-#define DRV_AUTHOR      "Bryan Wu, Luke Yang"
-#define DRV_DESC        "Blackfin on-chip Ethernet MAC driver"
-
-MODULE_AUTHOR(DRV_AUTHOR);
+MODULE_AUTHOR("Bryan Wu, Luke Yang");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION(DRV_DESC);
 MODULE_ALIAS("platform:bfin_mac");
 
 #if defined(CONFIG_BFIN_MAC_USE_L1)
-# define bfin_mac_alloc(dma_handle, size)  l1_data_sram_zalloc(size)
-# define bfin_mac_free(dma_handle, ptr)    l1_data_sram_free(ptr)
+# define bfin_mac_alloc(dma_handle, size, num)  l1_data_sram_zalloc(size*num)
+# define bfin_mac_free(dma_handle, ptr, num)    l1_data_sram_free(ptr)
 #else
-# define bfin_mac_alloc(dma_handle, size) \
-        dma_alloc_coherent(NULL, size, dma_handle, GFP_KERNEL)
-# define bfin_mac_free(dma_handle, ptr) \
-        dma_free_coherent(NULL, sizeof(*ptr), ptr, dma_handle)
+# define bfin_mac_alloc(dma_handle, size, num) \
+        dma_alloc_coherent(NULL, size*num, dma_handle, GFP_KERNEL)
+# define bfin_mac_free(dma_handle, ptr, num) \
+        dma_free_coherent(NULL, sizeof(*ptr)*num, ptr, dma_handle)
 #endif
 
 #define PKT_BUF_SZ 1580
@@ -75,12 +75,6 @@ static struct net_dma_desc_tx *current_tx_ptr;
 static struct net_dma_desc_tx *tx_desc;
 static struct net_dma_desc_rx *rx_desc;
 
-#if defined(CONFIG_BFIN_MAC_RMII)
-static u16 pin_req[] = P_RMII0;
-#else
-static u16 pin_req[] = P_MII0;
-#endif
-
 static void desc_list_free(void)
 {
         struct net_dma_desc_rx *r;
@@ -101,7 +95,7 @@ static void desc_list_free(void)
                                 t = t->next;
                         }
                 }
-                bfin_mac_free(dma_handle, tx_desc);
+                bfin_mac_free(dma_handle, tx_desc, CONFIG_BFIN_TX_DESC_NUM);
         }
 
         if (rx_desc) {
@@ -115,7 +109,7 @@ static void desc_list_free(void)
                                 r = r->next;
                         }
                 }
-                bfin_mac_free(dma_handle, rx_desc);
+                bfin_mac_free(dma_handle, rx_desc, CONFIG_BFIN_RX_DESC_NUM);
         }
 }
 
@@ -132,13 +126,13 @@ static int desc_list_init(void)
 #endif
 
         tx_desc = bfin_mac_alloc(&dma_handle,
-                                sizeof(struct net_dma_desc_tx) *
+                                sizeof(struct net_dma_desc_tx),
                                 CONFIG_BFIN_TX_DESC_NUM);
         if (tx_desc == NULL)
                 goto init_error;
 
         rx_desc = bfin_mac_alloc(&dma_handle,
-                                sizeof(struct net_dma_desc_rx) *
+                                sizeof(struct net_dma_desc_rx),
                                 CONFIG_BFIN_RX_DESC_NUM);
         if (rx_desc == NULL)
                 goto init_error;
@@ -195,8 +189,7 @@ static int desc_list_init(void)
                 /* allocate a new skb for next time receive */
                 new_skb = dev_alloc_skb(PKT_BUF_SZ + NET_IP_ALIGN);
                 if (!new_skb) {
-                        printk(KERN_NOTICE DRV_NAME
-                               ": init: low on mem - packet dropped\n");
+                        pr_notice("init: low on mem - packet dropped\n");
                         goto init_error;
                 }
                 skb_reserve(new_skb, NET_IP_ALIGN);
@@ -246,7 +239,7 @@ static int desc_list_init(void)
 
 init_error:
         desc_list_free();
-        printk(KERN_ERR DRV_NAME ": kmalloc failed\n");
+        pr_err("kmalloc failed\n");
         return -ENOMEM;
 }
 
@@ -265,8 +258,7 @@ static int bfin_mdio_poll(void)
         while ((bfin_read_EMAC_STAADD()) & STABUSY) {
                 udelay(1);
                 if (timeout_cnt-- < 0) {
-                        printk(KERN_ERR DRV_NAME
-                        ": wait MDC/MDIO transaction to complete timeout\n");
+                        pr_err("wait MDC/MDIO transaction to complete timeout\n");
                         return -ETIMEDOUT;
                 }
         }
@@ -346,23 +338,23 @@ static void bfin_mac_adjust_link(struct net_device *dev)
                 }
 
                 if (phydev->speed != lp->old_speed) {
-#if defined(CONFIG_BFIN_MAC_RMII)
-                        u32 opmode = bfin_read_EMAC_OPMODE();
-                        switch (phydev->speed) {
-                        case 10:
-                                opmode |= RMII_10;
-                                break;
-                        case 100:
-                                opmode &= ~(RMII_10);
-                                break;
-                        default:
-                                printk(KERN_WARNING
-                                        "%s: Ack!  Speed (%d) is not 10/100!\n",
-                                        DRV_NAME, phydev->speed);
-                                break;
+                        if (phydev->interface == PHY_INTERFACE_MODE_RMII) {
+                                u32 opmode = bfin_read_EMAC_OPMODE();
+                                switch (phydev->speed) {
+                                case 10:
+                                        opmode |= RMII_10;
+                                        break;
+                                case 100:
+                                        opmode &= ~RMII_10;
+                                        break;
+                                default:
+                                        netdev_warn(dev,
+                                                "Ack! Speed (%d) is not 10/100!\n",
+                                                phydev->speed);
+                                        break;
+                                }
+                                bfin_write_EMAC_OPMODE(opmode);
                         }
-                        bfin_write_EMAC_OPMODE(opmode);
-#endif
 
                         new_state = 1;
                         lp->old_speed = phydev->speed;
@@ -391,7 +383,7 @@ static void bfin_mac_adjust_link(struct net_device *dev)
 /* MDC  = 2.5 MHz */
 #define MDC_CLK 2500000
 
-static int mii_probe(struct net_device *dev)
+static int mii_probe(struct net_device *dev, int phy_mode)
 {
         struct bfin_mac_local *lp = netdev_priv(dev);
         struct phy_device *phydev = NULL;
@@ -410,8 +402,8 @@ static int mii_probe(struct net_device *dev)
         sysctl = (sysctl & ~MDCDIV) | SET_MDCDIV(mdc_div);
         bfin_write_EMAC_SYSCTL(sysctl);
 
-        /* search for connect PHY device */
-        for (i = 0; i < PHY_MAX_ADDR; i++) {
+        /* search for connected PHY device */
+        for (i = 0; i < PHY_MAX_ADDR; ++i) {
                 struct phy_device *const tmp_phydev = lp->mii_bus->phy_map[i];
 
                 if (!tmp_phydev)
@@ -423,21 +415,21 @@ static int mii_probe(struct net_device *dev)
 
         /* now we are supposed to have a proper phydev, to attach to... */
         if (!phydev) {
-                printk(KERN_INFO "%s: Don't found any phy device at all\n",
-                        dev->name);
+                netdev_err(dev, "no phy device found\n");
                 return -ENODEV;
         }
 
-#if defined(CONFIG_BFIN_MAC_RMII)
-        phydev = phy_connect(dev, dev_name(&phydev->dev), &bfin_mac_adjust_link,
-                        0, PHY_INTERFACE_MODE_RMII);
-#else
+        if (phy_mode != PHY_INTERFACE_MODE_RMII &&
+                phy_mode != PHY_INTERFACE_MODE_MII) {
+                netdev_err(dev, "invalid phy interface mode\n");
+                return -EINVAL;
+        }
+
         phydev = phy_connect(dev, dev_name(&phydev->dev), &bfin_mac_adjust_link,
-                        0, PHY_INTERFACE_MODE_MII);
-#endif
+                        0, phy_mode);
 
         if (IS_ERR(phydev)) {
-                printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name);
+                netdev_err(dev, "could not attach PHY\n");
                 return PTR_ERR(phydev);
         }
 
@@ -458,11 +450,10 @@ static int mii_probe(struct net_device *dev)
         lp->old_duplex = -1;
         lp->phydev = phydev;
 
-        printk(KERN_INFO "%s: attached PHY driver [%s] "
-               "(mii_bus:phy_addr=%s, irq=%d, mdc_clk=%dHz(mdc_div=%d)"
-               "@sclk=%dMHz)\n",
-               DRV_NAME, phydev->drv->name, dev_name(&phydev->dev), phydev->irq,
-               MDC_CLK, mdc_div, sclk/1000000);
+        pr_info("attached PHY driver [%s] "
+                "(mii_bus:phy_addr=%s, irq=%d, mdc_clk=%dHz(mdc_div=%d)@sclk=%dMHz)\n",
+                phydev->drv->name, dev_name(&phydev->dev), phydev->irq,
+                MDC_CLK, mdc_div, sclk/1000000);
 
         return 0;
 }
@@ -507,7 +498,7 @@ bfin_mac_ethtool_setsettings(struct net_device *dev, struct ethtool_cmd *cmd)
 static void bfin_mac_ethtool_getdrvinfo(struct net_device *dev,
                                         struct ethtool_drvinfo *info)
 {
-        strcpy(info->driver, DRV_NAME);
+        strcpy(info->driver, KBUILD_MODNAME);
         strcpy(info->version, DRV_VERSION);
         strcpy(info->fw_version, "N/A");
         strcpy(info->bus_info, dev_name(&dev->dev));
@@ -567,8 +558,10 @@ static const struct ethtool_ops bfin_mac_ethtool_ops = {
 };
 
 /**************************************************************************/
-void setup_system_regs(struct net_device *dev)
+static void setup_system_regs(struct net_device *dev)
 {
+        struct bfin_mac_local *lp = netdev_priv(dev);
+        int i;
         unsigned short sysctl;
 
         /*
@@ -576,6 +569,15 @@ void setup_system_regs(struct net_device *dev)
          * Configure checksum support and rcve frame word alignment
          */
         sysctl = bfin_read_EMAC_SYSCTL();
+        /*
+         * check if interrupt is requested for any PHY,
+         * enable PHY interrupt only if needed
+         */
+        for (i = 0; i < PHY_MAX_ADDR; ++i)
+                if (lp->mii_bus->irq[i] != PHY_POLL)
+                        break;
+        if (i < PHY_MAX_ADDR)
+                sysctl |= PHYIE;
         sysctl |= RXDWA;
 #if defined(BFIN_MAC_CSUM_OFFLOAD)
         sysctl |= RXCKS;
@@ -586,6 +588,10 @@ void setup_system_regs(struct net_device *dev)
 
         bfin_write_EMAC_MMC_CTL(RSTC | CROLL);
 
+        /* Set vlan regs to let 1522 bytes long packets pass through */
+        bfin_write_EMAC_VLAN1(lp->vlan1_mask);
+        bfin_write_EMAC_VLAN2(lp->vlan2_mask);
+
         /* Initialize the TX DMA channel registers */
         bfin_write_DMA2_X_COUNT(0);
         bfin_write_DMA2_X_MODIFY(4);
@@ -803,15 +809,14 @@ static void bfin_dump_hwtamp(char *s, ktime_t *hw, ktime_t *ts, struct timecompa
 static void bfin_tx_hwtstamp(struct net_device *netdev, struct sk_buff *skb)
 {
         struct bfin_mac_local *lp = netdev_priv(netdev);
-        union skb_shared_tx *shtx = skb_tx(skb);
 
-        if (shtx->hardware) {
+        if (skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) {
                 int timeout_cnt = MAX_TIMEOUT_CNT;
 
                 /* When doing time stamping, keep the connection to the socket
                  * a while longer
                  */
-                shtx->in_progress = 1;
+                skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
 
                 /*
                  * The timestamping is done at the EMAC module's MII/RMII interface
@@ -822,8 +827,7 @@ static void bfin_tx_hwtstamp(struct net_device *netdev, struct sk_buff *skb)
                 while ((!(bfin_read_EMAC_PTP_ISTAT() & TXTL)) && (--timeout_cnt))
                         udelay(1);
                 if (timeout_cnt == 0)
-                        printk(KERN_ERR DRV_NAME
-                                        ": fails to timestamp the TX packet\n");
+                        netdev_err(netdev, "timestamp the TX packet failed\n");
                 else {
                         struct skb_shared_hwtstamps shhwtstamps;
                         u64 ns;
@@ -991,7 +995,6 @@ static int bfin_mac_hard_start_xmit(struct sk_buff *skb,
         struct bfin_mac_local *lp = netdev_priv(dev);
         u16 *data;
         u32 data_align = (unsigned long)(skb->data) & 0x3;
-        union skb_shared_tx *shtx = skb_tx(skb);
 
         current_tx_ptr->skb = skb;
 
@@ -1005,7 +1008,7 @@ static int bfin_mac_hard_start_xmit(struct sk_buff *skb,
                  * of this field are the length of the packet payload in bytes and the higher
                  * 4 bits are the timestamping enable field.
                  */
-                if (shtx->hardware)
+                if (skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)
                         *data |= 0x1000;
 
                 current_tx_ptr->desc_a.start_addr = (u32)data;
@@ -1015,7 +1018,7 @@ static int bfin_mac_hard_start_xmit(struct sk_buff *skb,
         } else {
                 *((u16 *)(current_tx_ptr->packet)) = (u16)(skb->len);
                 /* enable timestamping for the sent packet */
-                if (shtx->hardware)
+                if (skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)
                         *((u16 *)(current_tx_ptr->packet)) |= 0x1000;
                 memcpy((u8 *)(current_tx_ptr->packet + 2), skb->data,
                         skb->len);
@@ -1079,8 +1082,7 @@ static void bfin_mac_rx(struct net_device *dev)
          * we which case we simply drop the packet
          */
         if (current_rx_ptr->status.status_word & RX_ERROR_MASK) {
-                printk(KERN_NOTICE DRV_NAME
-                       ": rx: receive error - packet dropped\n");
+                netdev_notice(dev, "rx: receive error - packet dropped\n");
                 dev->stats.rx_dropped++;
                 goto out;
         }
@@ -1090,8 +1092,7 @@ static void bfin_mac_rx(struct net_device *dev)
 
         new_skb = dev_alloc_skb(PKT_BUF_SZ + NET_IP_ALIGN);
         if (!new_skb) {
-                printk(KERN_NOTICE DRV_NAME
-                       ": rx: low on mem - packet dropped\n");
+                netdev_notice(dev, "rx: low on mem - packet dropped\n");
                 dev->stats.rx_dropped++;
                 goto out;
         }
@@ -1204,12 +1205,12 @@ static void bfin_mac_disable(void)
 /*
  * Enable Interrupts, Receive, and Transmit
  */
-static int bfin_mac_enable(void)
+static int bfin_mac_enable(struct phy_device *phydev)
 {
         int ret;
         u32 opmode;
 
-        pr_debug("%s: %s\n", DRV_NAME, __func__);
+        pr_debug("%s\n", __func__);
 
         /* Set RX DMA */
         bfin_write_DMA1_NEXT_DESC_PTR(&(rx_list_head->desc_a));
@@ -1234,12 +1235,22 @@ static int bfin_mac_enable(void)
                 opmode |= DRO | DC | PSF;
         opmode |= RE;
 
-#if defined(CONFIG_BFIN_MAC_RMII)
-        opmode |= RMII; /* For Now only 100MBit are supported */
-#if (defined(CONFIG_BF537) || defined(CONFIG_BF536)) && CONFIG_BF_REV_0_2
-        opmode |= TE;
-#endif
+        if (phydev->interface == PHY_INTERFACE_MODE_RMII) {
+                opmode |= RMII; /* For Now only 100MBit are supported */
+#if defined(CONFIG_BF537) || defined(CONFIG_BF536)
+                if (__SILICON_REVISION__ < 3) {
+                        /*
+                         * This isn't publicly documented (fun times!), but in
+                         * silicon <=0.2, the RX and TX pins are clocked together.
+                         * So in order to recv, we must enable the transmit side
+                         * as well.  This will cause a spurious TX interrupt too,
+                         * but we can easily consume that.
+                         */
+                        opmode |= TE;
+                }
 #endif
+        }
+
         /* Turn on the EMAC rx */
         bfin_write_EMAC_OPMODE(opmode);
 
@@ -1271,7 +1282,7 @@ static void bfin_mac_timeout(struct net_device *dev)
         if (netif_queue_stopped(lp->ndev))
                 netif_wake_queue(lp->ndev);
 
-        bfin_mac_enable();
+        bfin_mac_enable(lp->phydev);
 
         /* We can accept TX packets again */
         dev->trans_start = jiffies; /* prevent tx timeout */
@@ -1282,19 +1293,12 @@ static void bfin_mac_multicast_hash(struct net_device *dev)
 {
         u32 emac_hashhi, emac_hashlo;
         struct netdev_hw_addr *ha;
-        char *addrs;
         u32 crc;
 
         emac_hashhi = emac_hashlo = 0;
 
         netdev_for_each_mc_addr(ha, dev) {
-                addrs = ha->addr;
-
-                /* skip non-multicast addresses */
-                if (!(*addrs & 1))
-                        continue;
-
-                crc = ether_crc(ETH_ALEN, addrs);
+                crc = ether_crc(ETH_ALEN, ha->addr);
                 crc >>= 26;
 
                 if (crc & 0x20)
@@ -1318,7 +1322,7 @@ static void bfin_mac_set_multicast_list(struct net_device *dev)
         u32 sysctl;
 
         if (dev->flags & IFF_PROMISC) {
-                printk(KERN_INFO "%s: set to promisc mode\n", dev->name);
+                netdev_info(dev, "set promisc mode\n");
                 sysctl = bfin_read_EMAC_OPMODE();
                 sysctl |= PR;
                 bfin_write_EMAC_OPMODE(sysctl);
@@ -1343,11 +1347,19 @@ static void bfin_mac_set_multicast_list(struct net_device *dev)
 
 static int bfin_mac_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
 {
+        struct bfin_mac_local *lp = netdev_priv(netdev);
+
+        if (!netif_running(netdev))
+                return -EINVAL;
+
         switch (cmd) {
         case SIOCSHWTSTAMP:
                 return bfin_mac_hwtstamp_ioctl(netdev, ifr, cmd);
         default:
-                return -EOPNOTSUPP;
+                if (lp->phydev)
+                        return phy_mii_ioctl(lp->phydev, ifr, cmd);
+                else
+                        return -EOPNOTSUPP;
         }
 }
 
@@ -1380,7 +1392,7 @@ static int bfin_mac_open(struct net_device *dev)
          * address using ifconfig eth0 hw ether xx:xx:xx:xx:xx:xx
          */
         if (!is_valid_ether_addr(dev->dev_addr)) {
-                printk(KERN_WARNING DRV_NAME ": no valid ethernet hw addr\n");
+                netdev_warn(dev, "no valid ethernet hw addr\n");
                 return -EINVAL;
         }
 
@@ -1395,7 +1407,7 @@ static int bfin_mac_open(struct net_device *dev)
         setup_mac_addr(dev->dev_addr);
 
         bfin_mac_disable();
-        ret = bfin_mac_enable();
+        ret = bfin_mac_enable(lp->phydev);
         if (ret)
                 return ret;
         pr_debug("hardware init finished\n");
@@ -1451,6 +1463,7 @@ static int __devinit bfin_mac_probe(struct platform_device *pdev)
         struct net_device *ndev;
         struct bfin_mac_local *lp;
         struct platform_device *pd;
+        struct bfin_mii_bus_platform_data *mii_bus_data;
         int rc;
 
         ndev = alloc_etherdev(sizeof(struct bfin_mac_local));
@@ -1502,16 +1515,20 @@ static int __devinit bfin_mac_probe(struct platform_device *pdev)
         if (!lp->mii_bus) {
                 dev_err(&pdev->dev, "Cannot get mii_bus!\n");
                 rc = -ENODEV;
-                goto out_err_mii_bus_probe;
+                goto out_err_probe_mac;
         }
         lp->mii_bus->priv = ndev;
+        mii_bus_data = pd->dev.platform_data;
 
-        rc = mii_probe(ndev);
+        rc = mii_probe(ndev, mii_bus_data->phy_mode);
         if (rc) {
                 dev_err(&pdev->dev, "MII Probe failed!\n");
                 goto out_err_mii_probe;
         }
 
+        lp->vlan1_mask = ETH_P_8021Q | mii_bus_data->vlan1_mask;
+        lp->vlan2_mask = ETH_P_8021Q | mii_bus_data->vlan2_mask;
+
         /* Fill in the fields of the device structure with ethernet values. */
         ether_setup(ndev);
 
@@ -1543,7 +1560,7 @@ static int __devinit bfin_mac_probe(struct platform_device *pdev)
         bfin_mac_hwtstamp_init(ndev);
 
         /* now, print out the card info, in a short format.. */
-        dev_info(&pdev->dev, "%s, Version %s\n", DRV_DESC, DRV_VERSION);
+        netdev_info(ndev, "%s, Version %s\n", DRV_DESC, DRV_VERSION);
 
         return 0;
 
@@ -1553,8 +1570,6 @@ out_err_request_irq:
 out_err_mii_probe:
         mdiobus_unregister(lp->mii_bus);
         mdiobus_free(lp->mii_bus);
-out_err_mii_bus_probe:
-        peripheral_free_list(pin_req);
 out_err_probe_mac:
         platform_set_drvdata(pdev, NULL);
         free_netdev(ndev);
@@ -1577,8 +1592,6 @@ static int __devexit bfin_mac_remove(struct platform_device *pdev)
 
         free_netdev(ndev);
 
-        peripheral_free_list(pin_req);
-
         return 0;
 }
 
@@ -1624,13 +1637,22 @@ static int bfin_mac_resume(struct platform_device *pdev)
 static int __devinit bfin_mii_bus_probe(struct platform_device *pdev)
 {
         struct mii_bus *miibus;
+        struct bfin_mii_bus_platform_data *mii_bus_pd;
+        const unsigned short *pin_req;
         int rc, i;
 
+        mii_bus_pd = dev_get_platdata(&pdev->dev);
+        if (!mii_bus_pd) {
+                dev_err(&pdev->dev, "No peripherals in platform data!\n");
+                return -EINVAL;
+        }
+
         /*
          * We are setting up a network card,
          * so set the GPIO pins to Ethernet mode
          */
-        rc = peripheral_request_list(pin_req, DRV_NAME);
+        pin_req = mii_bus_pd->mac_peripherals;
+        rc = peripheral_request_list(pin_req, KBUILD_MODNAME);
         if (rc) {
                 dev_err(&pdev->dev, "Requesting peripherals failed!\n");
                 return rc;
@@ -1646,13 +1668,30 @@ static int __devinit bfin_mii_bus_probe(struct platform_device *pdev)
 
         miibus->parent = &pdev->dev;
         miibus->name = "bfin_mii_bus";
+        miibus->phy_mask = mii_bus_pd->phy_mask;
+
         snprintf(miibus->id, MII_BUS_ID_SIZE, "0");
         miibus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
-        if (miibus->irq == NULL)
-                goto out_err_alloc;
-        for (i = 0; i < PHY_MAX_ADDR; ++i)
+        if (!miibus->irq)
+                goto out_err_irq_alloc;
+
+        for (i = rc; i < PHY_MAX_ADDR; ++i)
                 miibus->irq[i] = PHY_POLL;
 
+        rc = clamp(mii_bus_pd->phydev_number, 0, PHY_MAX_ADDR);
+        if (rc != mii_bus_pd->phydev_number)
+                dev_err(&pdev->dev, "Invalid number (%i) of phydevs\n",
+                        mii_bus_pd->phydev_number);
+        for (i = 0; i < rc; ++i) {
+                unsigned short phyaddr = mii_bus_pd->phydev_data[i].addr;
+                if (phyaddr < PHY_MAX_ADDR)
+                        miibus->irq[phyaddr] = mii_bus_pd->phydev_data[i].irq;
+                else
+                        dev_err(&pdev->dev,
+                                "Invalid PHY address %i for phydev %i\n",
+                                phyaddr, i);
+        }
+
         rc = mdiobus_register(miibus);
         if (rc) {
                 dev_err(&pdev->dev, "Cannot register MDIO bus!\n");
@@ -1664,6 +1703,7 @@ static int __devinit bfin_mii_bus_probe(struct platform_device *pdev)
 
 out_err_mdiobus_register:
         kfree(miibus->irq);
+out_err_irq_alloc:
         mdiobus_free(miibus);
 out_err_alloc:
         peripheral_free_list(pin_req);
@@ -1674,11 +1714,15 @@ out_err_alloc:
 static int __devexit bfin_mii_bus_remove(struct platform_device *pdev)
 {
         struct mii_bus *miibus = platform_get_drvdata(pdev);
+        struct bfin_mii_bus_platform_data *mii_bus_pd =
+                dev_get_platdata(&pdev->dev);
+
         platform_set_drvdata(pdev, NULL);
         mdiobus_unregister(miibus);
         kfree(miibus->irq);
         mdiobus_free(miibus);
-        peripheral_free_list(pin_req);
+        peripheral_free_list(mii_bus_pd->mac_peripherals);
+
         return 0;
 }
 
@@ -1697,7 +1741,7 @@ static struct platform_driver bfin_mac_driver = {
         .resume = bfin_mac_resume,
         .suspend = bfin_mac_suspend,
         .driver = {
-                .name = DRV_NAME,
+                .name = KBUILD_MODNAME,
                 .owner  = THIS_MODULE,
         },
 };