ooops, m4 is already part of the host tools

[openwrt.git] / target / linux / ifxmips / files / drivers / net / ifxmips_mii0.c

diff --git a/target/linux/ifxmips/files/drivers/net/ifxmips_mii0.c b/target/linux/ifxmips/files/drivers/net/ifxmips_mii0.c
index 7f53d64..1185a15 100644 (file)
--- a/target/linux/ifxmips/files/drivers/net/ifxmips_mii0.c
+++ b/target/linux/ifxmips/files/drivers/net/ifxmips_mii0.c
@@ -14,7 +14,7 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  *
  *   Copyright (C) 2005 Wu Qi Ming <Qi-Ming.Wu@infineon.com>
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  *
  *   Copyright (C) 2005 Wu Qi Ming <Qi-Ming.Wu@infineon.com>

- *   Copyright (C) 2008 John Crispin <blogic@openwrt.org> 
+ *   Copyright (C) 2008 John Crispin <blogic@openwrt.org>

  */
 
 #include <linux/kernel.h>
  */
 
 #include <linux/kernel.h>


@@ -22,7 +22,7 @@
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/interrupt.h>
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/interrupt.h>

-#include <asm/uaccess.h>
+#include <linux/uaccess.h>

 #include <linux/in.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/in.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>


@@ -32,99 +32,100 @@
 #include <linux/mm.h>
 #include <linux/platform_device.h>
 #include <linux/ethtool.h>
 #include <linux/mm.h>
 #include <linux/platform_device.h>
 #include <linux/ethtool.h>

-#include <asm/checksum.h>

 #include <linux/init.h>
 #include <linux/init.h>

-#include <asm/delay.h>
+#include <linux/delay.h>
+#include <asm/checksum.h>

 #include <asm/ifxmips/ifxmips.h>
 #include <asm/ifxmips/ifxmips.h>

-#include <asm/ifxmips/ifxmips_mii0.h>

 #include <asm/ifxmips/ifxmips_dma.h>
 #include <asm/ifxmips/ifxmips_pmu.h>
 
 #include <asm/ifxmips/ifxmips_dma.h>
 #include <asm/ifxmips/ifxmips_pmu.h>
 

-#define DRVNAME                "ifxmips_mii0"
+struct ifxmips_mii_priv {
+       struct net_device_stats stats;
+       struct dma_device_info *dma_device;
+       struct sk_buff *skb;
+};

 
 static struct net_device *ifxmips_mii0_dev;
 
 static struct net_device *ifxmips_mii0_dev;

-static unsigned char u_boot_ethaddr[MAX_ADDR_LEN];
+static unsigned char mac_addr[MAX_ADDR_LEN];

 
 

-void
-ifxmips_write_mdio(u32 phy_addr, u32 phy_reg, u16 phy_data)
+void ifxmips_write_mdio(u32 phy_addr, u32 phy_reg, u16 phy_data)

 {
        u32 val = MDIO_ACC_REQUEST |
                ((phy_addr & MDIO_ACC_ADDR_MASK) << MDIO_ACC_ADDR_OFFSET) |
                ((phy_reg & MDIO_ACC_REG_MASK) << MDIO_ACC_REG_OFFSET) |
                phy_data;
 
 {
        u32 val = MDIO_ACC_REQUEST |
                ((phy_addr & MDIO_ACC_ADDR_MASK) << MDIO_ACC_ADDR_OFFSET) |
                ((phy_reg & MDIO_ACC_REG_MASK) << MDIO_ACC_REG_OFFSET) |
                phy_data;
 

-       while(ifxmips_r32(IFXMIPS_PPE32_MDIO_ACC) & MDIO_ACC_REQUEST);
+       while (ifxmips_r32(IFXMIPS_PPE32_MDIO_ACC) & MDIO_ACC_REQUEST)
+               ;

        ifxmips_w32(val, IFXMIPS_PPE32_MDIO_ACC);
 }
        ifxmips_w32(val, IFXMIPS_PPE32_MDIO_ACC);
 }

+EXPORT_SYMBOL(ifxmips_write_mdio);

 
 

-unsigned short
-ifxmips_read_mdio(u32 phy_addr, u32 phy_reg)
+unsigned short ifxmips_read_mdio(u32 phy_addr, u32 phy_reg)

 {
        u32 val = MDIO_ACC_REQUEST | MDIO_ACC_READ |
                ((phy_addr & MDIO_ACC_ADDR_MASK) << MDIO_ACC_ADDR_OFFSET) |
                ((phy_reg & MDIO_ACC_REG_MASK) << MDIO_ACC_REG_OFFSET);
 
 {
        u32 val = MDIO_ACC_REQUEST | MDIO_ACC_READ |
                ((phy_addr & MDIO_ACC_ADDR_MASK) << MDIO_ACC_ADDR_OFFSET) |
                ((phy_reg & MDIO_ACC_REG_MASK) << MDIO_ACC_REG_OFFSET);
 

+       while (ifxmips_r32(IFXMIPS_PPE32_MDIO_ACC) & MDIO_ACC_REQUEST)
+               ;

        ifxmips_w32(val, IFXMIPS_PPE32_MDIO_ACC);
        ifxmips_w32(val, IFXMIPS_PPE32_MDIO_ACC);

-       while(ifxmips_r32(IFXMIPS_PPE32_MDIO_ACC) & MDIO_ACC_REQUEST){};
+       while (ifxmips_r32(IFXMIPS_PPE32_MDIO_ACC) & MDIO_ACC_REQUEST)
+               ;

        val = ifxmips_r32(IFXMIPS_PPE32_MDIO_ACC) & MDIO_ACC_VAL_MASK;
        return val;
 }
        val = ifxmips_r32(IFXMIPS_PPE32_MDIO_ACC) & MDIO_ACC_VAL_MASK;
        return val;
 }

+EXPORT_SYMBOL(ifxmips_read_mdio);

 
 

-int
-ifxmips_ifxmips_mii_open(struct net_device *dev)
+int ifxmips_ifxmips_mii_open(struct net_device *dev)

 {
 {

-       struct ifxmips_mii_priv* priv = (struct ifxmips_mii_priv*)dev->priv;
-       struct dma_device_info* dma_dev = priv->dma_device;
+       struct ifxmips_mii_priv *priv = (struct ifxmips_mii_priv *)dev->priv;
+       struct dma_device_info *dma_dev = priv->dma_device;

        int i;
 
        int i;
 

-       for(i = 0; i < dma_dev->max_rx_chan_num; i++)
-       {
-               if((dma_dev->rx_chan[i])->control == IFXMIPS_DMA_CH_ON)
+       for (i = 0; i < dma_dev->max_rx_chan_num; i++) {
+               if ((dma_dev->rx_chan[i])->control == IFXMIPS_DMA_CH_ON)

                        (dma_dev->rx_chan[i])->open(dma_dev->rx_chan[i]);
        }
        netif_start_queue(dev);
        return 0;
 }
 
                        (dma_dev->rx_chan[i])->open(dma_dev->rx_chan[i]);
        }
        netif_start_queue(dev);
        return 0;
 }
 

-int
-ifxmips_mii_release(struct net_device *dev){
-       struct ifxmips_mii_priv* priv = (struct ifxmips_mii_priv*)dev->priv;
-       struct dma_device_info* dma_dev = priv->dma_device;
+int ifxmips_mii_release(struct net_device *dev)
+{
+       struct ifxmips_mii_priv *priv = (struct ifxmips_mii_priv *)dev->priv;
+       struct dma_device_info *dma_dev = priv->dma_device;

        int i;
 
        int i;
 

-       for(i = 0; i < dma_dev->max_rx_chan_num; i++)
+       for (i = 0; i < dma_dev->max_rx_chan_num; i++)

                dma_dev->rx_chan[i]->close(dma_dev->rx_chan[i]);
        netif_stop_queue(dev);
        return 0;
 }
 
                dma_dev->rx_chan[i]->close(dma_dev->rx_chan[i]);
        netif_stop_queue(dev);
        return 0;
 }
 

-int
-ifxmips_mii_hw_receive(struct net_device* dev,struct dma_device_info* dma_dev)
+int ifxmips_mii_hw_receive(struct net_device *dev, struct dma_device_info *dma_dev)

 {
 {

-       struct ifxmips_mii_priv *priv = (struct ifxmips_mii_priv*)dev->priv;
-       unsigned char* buf = NULL;
+       struct ifxmips_mii_priv *priv = (struct ifxmips_mii_priv *)dev->priv;
+       unsigned char *buf = NULL;

        struct sk_buff *skb = NULL;
        int len = 0;
 
        struct sk_buff *skb = NULL;
        int len = 0;
 

-       len = dma_device_read(dma_dev, &buf, (void**)&skb);
+       len = dma_device_read(dma_dev, &buf, (void **)&skb);

 
 

-       if(len >= ETHERNET_PACKET_DMA_BUFFER_SIZE)
-       {
-               printk(KERN_INFO DRVNAME ": packet too large %d\n",len);
+       if (len >= ETHERNET_PACKET_DMA_BUFFER_SIZE) {
+               printk(KERN_INFO "ifxmips_mii0: packet too large %d\n", len);

                goto ifxmips_mii_hw_receive_err_exit;
        }
 
        /* remove CRC */
        len -= 4;
                goto ifxmips_mii_hw_receive_err_exit;
        }
 
        /* remove CRC */
        len -= 4;

-       if(skb == NULL)
-       {
-               printk(KERN_INFO DRVNAME ": cannot restore pointer\n");
+       if (skb == NULL) {
+               printk(KERN_INFO "ifxmips_mii0: cannot restore pointer\n");

                goto ifxmips_mii_hw_receive_err_exit;
        }
 
                goto ifxmips_mii_hw_receive_err_exit;
        }
 

-       if(len > (skb->end - skb->tail))
-       {
-               printk(KERN_INFO DRVNAME ": BUG, len:%d end:%p tail:%p\n",
+       if (len > (skb->end - skb->tail)) {
+               printk(KERN_INFO "ifxmips_mii0: BUG, len:%d end:%p tail:%p\n",

                        (len+4), skb->end, skb->tail);
                goto ifxmips_mii_hw_receive_err_exit;
        }
                        (len+4), skb->end, skb->tail);
                goto ifxmips_mii_hw_receive_err_exit;
        }


@@ -139,9 +140,8 @@ ifxmips_mii_hw_receive(struct net_device* dev,struct dma_device_info* dma_dev)
        return 0;
 
 ifxmips_mii_hw_receive_err_exit:
        return 0;
 
 ifxmips_mii_hw_receive_err_exit:

-       if(len == 0)
-       {
-               if(skb)
+       if (len == 0) {
+               if (skb)

                        dev_kfree_skb_any(skb);
                priv->stats.rx_errors++;
                priv->stats.rx_dropped++;
                        dev_kfree_skb_any(skb);
                priv->stats.rx_errors++;
                priv->stats.rx_dropped++;


@@ -151,85 +151,76 @@ ifxmips_mii_hw_receive_err_exit:
        }
 }
 
        }
 }
 

-int
-ifxmips_mii_hw_tx(char *buf, int len, struct net_device *dev)
+int ifxmips_mii_hw_tx(char *buf, int len, struct net_device *dev)

 {
        int ret = 0;
        struct ifxmips_mii_priv *priv = dev->priv;
 {
        int ret = 0;
        struct ifxmips_mii_priv *priv = dev->priv;

-       struct dma_device_info* dma_dev = priv->dma_device;
-
+       struct dma_device_info *dma_dev = priv->dma_device;

        ret = dma_device_write(dma_dev, buf, len, priv->skb);
        ret = dma_device_write(dma_dev, buf, len, priv->skb);

-

        return ret;
 }
 
        return ret;
 }
 

-int
-ifxmips_mii_tx(struct sk_buff *skb, struct net_device *dev)
+int ifxmips_mii_tx(struct sk_buff *skb, struct net_device *dev)

 {
        int len;
        char *data;
        struct ifxmips_mii_priv *priv = dev->priv;
 {
        int len;
        char *data;
        struct ifxmips_mii_priv *priv = dev->priv;

-       struct dma_device_info* dma_dev = priv->dma_device;
+       struct dma_device_info *dma_dev = priv->dma_device;

 
        len = skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len;
        data = skb->data;
        priv->skb = skb;
        dev->trans_start = jiffies;
 
        len = skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len;
        data = skb->data;
        priv->skb = skb;
        dev->trans_start = jiffies;

-       // TODO we got more than 1 dma channel, so we should do something intelligent
-       // here to select one
+       /* TODO: we got more than 1 dma channel,
+          so we should do something intelligent here to select one */

        dma_dev->current_tx_chan = 0;
 
        wmb();
 
        dma_dev->current_tx_chan = 0;
 
        wmb();
 

-       if(ifxmips_mii_hw_tx(data, len, dev) != len)
-       {
+       if (ifxmips_mii_hw_tx(data, len, dev) != len) {

                dev_kfree_skb_any(skb);
                priv->stats.tx_errors++;
                priv->stats.tx_dropped++;
        } else {
                priv->stats.tx_packets++;
                dev_kfree_skb_any(skb);
                priv->stats.tx_errors++;
                priv->stats.tx_dropped++;
        } else {
                priv->stats.tx_packets++;

-               priv->stats.tx_bytes+=len;
+               priv->stats.tx_bytes += len;

        }
 
        return 0;
 }
 
        }
 
        return 0;
 }
 

-void
-ifxmips_mii_tx_timeout(struct net_device *dev)
+void ifxmips_mii_tx_timeout(struct net_device *dev)

 {
        int i;
 {
        int i;

-       struct ifxmips_mii_priv* priv = (struct ifxmips_mii_priv*)dev->priv;
+       struct ifxmips_mii_priv *priv = (struct ifxmips_mii_priv *)dev->priv;

 
        priv->stats.tx_errors++;
 
        priv->stats.tx_errors++;

-       for(i = 0; i < priv->dma_device->max_tx_chan_num; i++)
+       for (i = 0; i < priv->dma_device->max_tx_chan_num; i++)

                priv->dma_device->tx_chan[i]->disable_irq(priv->dma_device->tx_chan[i]);
        netif_wake_queue(dev);
        return;
 }
 
                priv->dma_device->tx_chan[i]->disable_irq(priv->dma_device->tx_chan[i]);
        netif_wake_queue(dev);
        return;
 }
 

-int
-dma_intr_handler(struct dma_device_info* dma_dev, int status)
+int dma_intr_handler(struct dma_device_info *dma_dev, int status)

 {
        int i;
 
 {
        int i;
 

-       switch(status)
-       {
+       switch (status) {

        case RCV_INT:
                ifxmips_mii_hw_receive(ifxmips_mii0_dev, dma_dev);
                break;
 
        case TX_BUF_FULL_INT:
        case RCV_INT:
                ifxmips_mii_hw_receive(ifxmips_mii0_dev, dma_dev);
                break;
 
        case TX_BUF_FULL_INT:

-               printk(KERN_INFO DRVNAME ": tx buffer full\n");
+               printk(KERN_INFO "ifxmips_mii0: tx buffer full\n");

                netif_stop_queue(ifxmips_mii0_dev);
                netif_stop_queue(ifxmips_mii0_dev);

-               for (i = 0; i < dma_dev->max_tx_chan_num; i++)
-               {
-                       if ((dma_dev->tx_chan[i])->control==IFXMIPS_DMA_CH_ON)
+               for (i = 0; i < dma_dev->max_tx_chan_num; i++) {
+                       if ((dma_dev->tx_chan[i])->control == IFXMIPS_DMA_CH_ON)

                                dma_dev->tx_chan[i]->enable_irq(dma_dev->tx_chan[i]);
                }
                break;
 
        case TRANSMIT_CPT_INT:
                                dma_dev->tx_chan[i]->enable_irq(dma_dev->tx_chan[i]);
                }
                break;
 
        case TRANSMIT_CPT_INT:

-               for(i = 0; i < dma_dev->max_tx_chan_num; i++)
+               for (i = 0; i < dma_dev->max_tx_chan_num; i++)

                        dma_dev->tx_chan[i]->disable_irq(dma_dev->tx_chan[i]);
 
                netif_wake_queue(ifxmips_mii0_dev);
                        dma_dev->tx_chan[i]->disable_irq(dma_dev->tx_chan[i]);
 
                netif_wake_queue(ifxmips_mii0_dev);


@@ -239,53 +230,47 @@ dma_intr_handler(struct dma_device_info* dma_dev, int status)
        return 0;
 }
 
        return 0;
 }
 

-unsigned char*
-ifxmips_etop_dma_buffer_alloc(int len, int *byte_offset, void **opt)
+unsigned char *ifxmips_etop_dma_buffer_alloc(int len, int *byte_offset, void **opt)

 {
        unsigned char *buffer = NULL;
        struct sk_buff *skb = NULL;
 
        skb = dev_alloc_skb(ETHERNET_PACKET_DMA_BUFFER_SIZE);
 {
        unsigned char *buffer = NULL;
        struct sk_buff *skb = NULL;
 
        skb = dev_alloc_skb(ETHERNET_PACKET_DMA_BUFFER_SIZE);

-       if(skb == NULL)
+       if (skb == NULL)

                return NULL;
 
                return NULL;
 

-       buffer = (unsigned char*)(skb->data);
+       buffer = (unsigned char *)(skb->data);

        skb_reserve(skb, 2);
        skb_reserve(skb, 2);

-       *(int*)opt = (int)skb;
+       *(int *)opt = (int)skb;

        *byte_offset = 2;
 
        return buffer;
 }
 
        *byte_offset = 2;
 
        return buffer;
 }
 

-void
-ifxmips_etop_dma_buffer_free(unsigned char *dataptr, void *opt)
+void ifxmips_etop_dma_buffer_free(unsigned char *dataptr, void *opt)

 {
        struct sk_buff *skb = NULL;
 
 {
        struct sk_buff *skb = NULL;
 

-       if(opt == NULL)
-       {
+       if (opt == NULL) {

                kfree(dataptr);
        } else {
                kfree(dataptr);
        } else {

-               skb = (struct sk_buff*)opt;
+               skb = (struct sk_buff *)opt;

                dev_kfree_skb_any(skb);
        }
 }
 
                dev_kfree_skb_any(skb);
        }
 }
 

-static struct net_device_stats*
-ifxmips_get_stats(struct net_device *dev)
+static struct net_device_stats *ifxmips_get_stats(struct net_device *dev)

 {
        return (struct net_device_stats *)dev->priv;
 }
 
 {
        return (struct net_device_stats *)dev->priv;
 }
 

-static int
-ifxmips_mii_dev_init(struct net_device *dev)
+static int ifxmips_mii_dev_init(struct net_device *dev)

 {
 {

-       u64 retval = 0;

        int i;
        struct ifxmips_mii_priv *priv;
 
        ether_setup(dev);
        int i;
        struct ifxmips_mii_priv *priv;
 
        ether_setup(dev);

-       printk(KERN_INFO DRVNAME ": %s is up\n", dev->name);
+       printk(KERN_INFO "ifxmips_mii0: %s is up\n", dev->name);

        dev->open = ifxmips_ifxmips_mii_open;
        dev->stop = ifxmips_mii_release;
        dev->hard_start_xmit = ifxmips_mii_tx;
        dev->open = ifxmips_ifxmips_mii_open;
        dev->stop = ifxmips_mii_release;
        dev->hard_start_xmit = ifxmips_mii_tx;


@@ -295,7 +280,7 @@ ifxmips_mii_dev_init(struct net_device *dev)
        memset(dev->priv, 0, sizeof(struct ifxmips_mii_priv));
        priv = dev->priv;
        priv->dma_device = dma_device_reserve("PPE");
        memset(dev->priv, 0, sizeof(struct ifxmips_mii_priv));
        priv = dev->priv;
        priv->dma_device = dma_device_reserve("PPE");

-       if(!priv->dma_device){
+       if (!priv->dma_device) {

                BUG();
                return -ENODEV;
        }
                BUG();
                return -ENODEV;
        }


@@ -304,87 +289,67 @@ ifxmips_mii_dev_init(struct net_device *dev)
        priv->dma_device->intr_handler = &dma_intr_handler;
        priv->dma_device->max_rx_chan_num = 4;
 
        priv->dma_device->intr_handler = &dma_intr_handler;
        priv->dma_device->max_rx_chan_num = 4;
 

-       for(i = 0; i < priv->dma_device->max_rx_chan_num; i++)
-       {
+       for (i = 0; i < priv->dma_device->max_rx_chan_num; i++) {

                priv->dma_device->rx_chan[i]->packet_size = ETHERNET_PACKET_DMA_BUFFER_SIZE;
                priv->dma_device->rx_chan[i]->control = IFXMIPS_DMA_CH_ON;
        }
 
                priv->dma_device->rx_chan[i]->packet_size = ETHERNET_PACKET_DMA_BUFFER_SIZE;
                priv->dma_device->rx_chan[i]->control = IFXMIPS_DMA_CH_ON;
        }
 

-       for(i = 0; i < priv->dma_device->max_tx_chan_num; i++)
-               if(i == 0)
+       for (i = 0; i < priv->dma_device->max_tx_chan_num; i++)
+               if (i == 0)

                        priv->dma_device->tx_chan[i]->control = IFXMIPS_DMA_CH_ON;
                else
                        priv->dma_device->tx_chan[i]->control = IFXMIPS_DMA_CH_OFF;
 
        dma_device_register(priv->dma_device);
 
                        priv->dma_device->tx_chan[i]->control = IFXMIPS_DMA_CH_ON;
                else
                        priv->dma_device->tx_chan[i]->control = IFXMIPS_DMA_CH_OFF;
 
        dma_device_register(priv->dma_device);
 

-       /*read the mac address from the mac table and put them into the mac table.*/
-       for (i = 0; i < 6; i++)
-               retval += u_boot_ethaddr[i];
-
-       //TODO
-       /* ethaddr not set in u-boot ? */
-       if(retval == 0)
-       {
-               printk(KERN_INFO DRVNAME ": using default MAC address\n");
-               dev->dev_addr[0] = 0x00;
-               dev->dev_addr[1] = 0x11;
-               dev->dev_addr[2] = 0x22;
-               dev->dev_addr[3] = 0x33;
-               dev->dev_addr[4] = 0x44;
-               dev->dev_addr[5] = 0x55;
-       } else {
-               for(i = 0; i < 6; i++)
-                       dev->dev_addr[i] = u_boot_ethaddr[i];
+       printk(KERN_INFO "ifxmips_mii0: using mac=");
+       for (i = 0; i < 6; i++) {
+               dev->dev_addr[i] = mac_addr[i];
+               printk("%02X%c", dev->dev_addr[i], (i == 5) ? ('\n') : (':'));

        }
        }

-

        return 0;
 }
 
        return 0;
 }
 

-static void
-ifxmips_mii_chip_init(int mode)
+static void ifxmips_mii_chip_init(int mode)

 {
        ifxmips_pmu_enable(IFXMIPS_PMU_PWDCR_DMA);
        ifxmips_pmu_enable(IFXMIPS_PMU_PWDCR_PPE);
 
 {
        ifxmips_pmu_enable(IFXMIPS_PMU_PWDCR_DMA);
        ifxmips_pmu_enable(IFXMIPS_PMU_PWDCR_PPE);
 

-       if(mode == REV_MII_MODE)
-               ifxmips_w32((ifxmips_r32(IFXMIPS_PPE32_CFG) & PPE32_MII_MASK) | PPE32_MII_REVERSE, IFXMIPS_PPE32_CFG);
-       else if(mode == MII_MODE)
-               ifxmips_w32((ifxmips_r32(IFXMIPS_PPE32_CFG) & PPE32_MII_MASK) | PPE32_MII_NORMAL, IFXMIPS_PPE32_CFG);
+       if (mode == REV_MII_MODE)
+               ifxmips_w32_mask(PPE32_MII_MASK, PPE32_MII_REVERSE, IFXMIPS_PPE32_CFG);
+       else if (mode == MII_MODE)
+               ifxmips_w32_mask(PPE32_MII_MASK, PPE32_MII_NORMAL, IFXMIPS_PPE32_CFG);

        ifxmips_w32(PPE32_PLEN_UNDER | PPE32_PLEN_OVER, IFXMIPS_PPE32_IG_PLEN_CTRL);
        ifxmips_w32(PPE32_CGEN, IFXMIPS_PPE32_ENET_MAC_CFG);
        wmb();
 }
 
        ifxmips_w32(PPE32_PLEN_UNDER | PPE32_PLEN_OVER, IFXMIPS_PPE32_IG_PLEN_CTRL);
        ifxmips_w32(PPE32_CGEN, IFXMIPS_PPE32_ENET_MAC_CFG);
        wmb();
 }
 

-static int
-ifxmips_mii_probe(struct platform_device *dev)
+static int ifxmips_mii_probe(struct platform_device *dev)

 {
        int result = 0;
 {
        int result = 0;

-
+       unsigned char *mac = (unsigned char *)dev->dev.platform_data;

        ifxmips_mii0_dev = alloc_etherdev(sizeof(struct ifxmips_mii_priv));
        ifxmips_mii0_dev->init = ifxmips_mii_dev_init;
        ifxmips_mii0_dev = alloc_etherdev(sizeof(struct ifxmips_mii_priv));
        ifxmips_mii0_dev->init = ifxmips_mii_dev_init;

+       memcpy(mac_addr, mac, 6);

        strcpy(ifxmips_mii0_dev->name, "eth%d");
        strcpy(ifxmips_mii0_dev->name, "eth%d");

+       ifxmips_mii_chip_init(REV_MII_MODE);

        result = register_netdev(ifxmips_mii0_dev);
        result = register_netdev(ifxmips_mii0_dev);

-       if (result)
-       {
-               printk(KERN_INFO DRVNAME ": error %i registering device \"%s\"\n", result, ifxmips_mii0_dev->name);
+       if (result) {
+               printk(KERN_INFO "ifxmips_mii0: error %i registering device \"%s\"\n", result, ifxmips_mii0_dev->name);

                goto out;
        }
 
                goto out;
        }
 

-       /* ifxmips eval kit connects the phy/switch in REV mode */
-       ifxmips_mii_chip_init(REV_MII_MODE);
-       printk(KERN_INFO DRVNAME ": driver loaded!\n");
+       printk(KERN_INFO "ifxmips_mii0: driver loaded!\n");

 
 out:
        return result;
 }
 
 
 out:
        return result;
 }
 

-static int
-ifxmips_mii_remove(struct platform_device *dev)
+static int ifxmips_mii_remove(struct platform_device *dev)

 {
 {

-       struct ifxmips_mii_priv *priv = (struct ifxmips_mii_priv*)ifxmips_mii0_dev->priv;
+       struct ifxmips_mii_priv *priv = (struct ifxmips_mii_priv *)ifxmips_mii0_dev->priv;

 
 

-       printk(KERN_INFO DRVNAME ": ifxmips_mii0 cleanup\n");
+       printk(KERN_INFO "ifxmips_mii0: ifxmips_mii0 cleanup\n");

 
        dma_device_unregister(priv->dma_device);
        dma_device_release(priv->dma_device);
 
        dma_device_unregister(priv->dma_device);
        dma_device_release(priv->dma_device);


@@ -394,27 +359,24 @@ ifxmips_mii_remove(struct platform_device *dev)
        return 0;
 }
 
        return 0;
 }
 

-static struct
-platform_driver ifxmips_mii_driver = {
+static struct platform_driver ifxmips_mii_driver = {

        .probe = ifxmips_mii_probe,
        .remove = ifxmips_mii_remove,
        .driver = {
        .probe = ifxmips_mii_probe,
        .remove = ifxmips_mii_remove,
        .driver = {

-               .name = DRVNAME,
+               .name = "ifxmips_mii0",

                .owner = THIS_MODULE,
        },
 };
 
                .owner = THIS_MODULE,
        },
 };
 

-int __init
-ifxmips_mii_init(void)
+int __init ifxmips_mii_init(void)

 {
        int ret = platform_driver_register(&ifxmips_mii_driver);
        if (ret)
 {
        int ret = platform_driver_register(&ifxmips_mii_driver);
        if (ret)

-               printk(KERN_INFO DRVNAME ": Error registering platfom driver!");
+               printk(KERN_INFO "ifxmips_mii0: Error registering platfom driver!");

        return ret;
 }
 
        return ret;
 }
 

-static void __exit
-ifxmips_mii_cleanup(void)
+static void __exit ifxmips_mii_cleanup(void)

 {
        platform_driver_unregister(&ifxmips_mii_driver);
 }
 {
        platform_driver_unregister(&ifxmips_mii_driver);
 }


@@ -425,3 +387,4 @@ module_exit(ifxmips_mii_cleanup);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("John Crispin <blogic@openwrt.org>");
 MODULE_DESCRIPTION("ethernet map driver for IFXMIPS boards");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("John Crispin <blogic@openwrt.org>");
 MODULE_DESCRIPTION("ethernet map driver for IFXMIPS boards");

+