powerpc, 8xx: remove support for 8xx

[oweals/u-boot.git] / drivers / net / 4xx_enet.c

diff --git a/drivers/net/4xx_enet.c b/drivers/net/4xx_enet.c
index 3c30f42b429dbe33aa9f09626e3b332e6cde7a02..e759339a5f5aea296f117f644642c9cf6cd0f165 100644 (file)
--- a/drivers/net/4xx_enet.c
+++ b/drivers/net/4xx_enet.c
@@ -67,7 +67,6 @@
 #include <asm/io.h>
 #include <asm/cache.h>
 #include <asm/mmu.h>
-#include <commproc.h>
 #include <asm/ppc4xx.h>
 #include <asm/ppc4xx-emac.h>
 #include <asm/ppc4xx-mal.h>
@@ -283,10 +282,9 @@ static void mal_err (struct eth_device *dev, unsigned long isr,
 static void emac_err (struct eth_device *dev, unsigned long isr);
 
 extern int phy_setup_aneg (char *devname, unsigned char addr);
-extern int emac4xx_miiphy_read (const char *devname, unsigned char addr,
-               unsigned char reg, unsigned short *value);
-extern int emac4xx_miiphy_write (const char *devname, unsigned char addr,
-               unsigned char reg, unsigned short value);
+int emac4xx_miiphy_read(struct mii_dev *bus, int addr, int devad, int reg);
+int emac4xx_miiphy_write(struct mii_dev *bus, int addr, int devad, int reg,
+                        u16 value);
 
 int board_emac_count(void);
 
@@ -900,7 +898,7 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
         * current transfer) have got the time to arrived before
         * netloop calls eth_halt
         */
-       printf ("About preceeding transfer (eth%d):\n"
+       printf ("About preceding transfer (eth%d):\n"
                "- Sent packet number %d\n"
                "- Received packet number %d\n"
                "- Handled packet number %d\n",
@@ -1726,7 +1724,7 @@ static void mal_err (struct eth_device *dev, unsigned long isr,
        mtdcr (MAL0_RXDEIR, 0x80000000);
 
 #ifdef INFO_4XX_ENET
-       printf("\nMAL error occured.... ISR = %lx UIC = = %lx   MAL_DEF = %lx  MAL_ERR= %lx\n",
+       printf("\nMAL error occurred.... ISR = %lx UIC = = %lx  MAL_DEF = %lx  MAL_ERR= %lx\n",
               isr, uic, maldef, mal_errr);
 #endif
 
@@ -1740,7 +1738,7 @@ static void emac_err (struct eth_device *dev, unsigned long isr)
 {
        EMAC_4XX_HW_PST hw_p = dev->priv;
 
-       printf ("EMAC%d error occured.... ISR = %lx\n", hw_p->devnum, isr);
+       printf ("EMAC%d error occurred.... ISR = %lx\n", hw_p->devnum, isr);
        out_be32((void *)EMAC0_ISR + hw_p->hw_addr, isr);
 }
 
@@ -2015,8 +2013,17 @@ int ppc_4xx_eth_initialize (bd_t * bis)
                eth_register(dev);
 
 #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
-               miiphy_register(dev->name,
-                               emac4xx_miiphy_read, emac4xx_miiphy_write);
+               int retval;
+               struct mii_dev *mdiodev = mdio_alloc();
+               if (!mdiodev)
+                       return -ENOMEM;
+               strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN);
+               mdiodev->read = emac4xx_miiphy_read;
+               mdiodev->write = emac4xx_miiphy_write;
+
+               retval = mdio_register(mdiodev);
+               if (retval < 0)
+                       return retval;
 #endif
 
                if (0 == virgin) {