Merge with /home/hs/U-Boot/u-boot-dev

[u-boot] / cpu / ppc4xx / miiphy.c

diff --git a/cpu/ppc4xx/miiphy.c b/cpu/ppc4xx/miiphy.c
index 24f91546c62ee2e31b6460fd4afc8aa8c4bfe756..f26f2a203a0e8c0c3b43edab5c0ec6c3381b62c4 100644 (file)
--- a/cpu/ppc4xx/miiphy.c
+++ b/cpu/ppc4xx/miiphy.c
@@ -55,14 +55,14 @@
 /* Dump out to the screen PHY regs                        */
 /***********************************************************/
 
-void miiphy_dump (unsigned char addr)
+void miiphy_dump (char *devname, unsigned char addr)
 {
        unsigned long i;
        unsigned short data;
 
 
        for (i = 0; i < 0x1A; i++) {
-               if (miiphy_read (addr, i, &data)) {
+               if (miiphy_read (devname, addr, i, &data)) {
                        printf ("read error for reg %lx\n", i);
                        return;
                }
@@ -79,21 +79,21 @@ void miiphy_dump (unsigned char addr)
 /***********************************************************/
 /* (Re)start autonegotiation                              */
 /***********************************************************/
-int phy_setup_aneg (unsigned char addr)
+int phy_setup_aneg (char *devname, unsigned char addr)
 {
        unsigned short ctl, adv;
 
        /* Setup standard advertise */
-       miiphy_read (addr, PHY_ANAR, &adv);
+       miiphy_read (devname, addr, PHY_ANAR, &adv);
        adv |= (PHY_ANLPAR_ACK | PHY_ANLPAR_RF | PHY_ANLPAR_T4 |
                PHY_ANLPAR_TXFD | PHY_ANLPAR_TX | PHY_ANLPAR_10FD |
                PHY_ANLPAR_10);
-       miiphy_write (addr, PHY_ANAR, adv);
+       miiphy_write (devname, addr, PHY_ANAR, adv);
 
        /* Start/Restart aneg */
-       miiphy_read (addr, PHY_BMCR, &ctl);
+       miiphy_read (devname, addr, PHY_BMCR, &ctl);
        ctl |= (PHY_BMCR_AUTON | PHY_BMCR_RST_NEG);
-       miiphy_write (addr, PHY_BMCR, ctl);
+       miiphy_write (devname, addr, PHY_BMCR, ctl);
 
        return 0;
 }
@@ -104,7 +104,7 @@ int phy_setup_aneg (unsigned char addr)
 /***********************************************************/
 unsigned int miiphy_getemac_offset (void)
 {
-#if defined(CONFIG_440) && defined(CONFIG_NET_MULTI)
+#if (defined(CONFIG_440) && !defined(CONFIG_440SP)) && defined(CONFIG_NET_MULTI)
        unsigned long zmii;
        unsigned long eoffset;
 
@@ -142,7 +142,8 @@ unsigned int miiphy_getemac_offset (void)
 }
 
 
-int miiphy_read (unsigned char addr, unsigned char reg, unsigned short *value)
+int emac4xx_miiphy_read (char *devname, unsigned char addr,
+               unsigned char reg, unsigned short *value)
 {
        unsigned long sta_reg;  /* STA scratch area */
        unsigned long i;
@@ -207,7 +208,8 @@ int miiphy_read (unsigned char addr, unsigned char reg, unsigned short *value)
 /* write a phy reg and return the value with a rc          */
 /***********************************************************/
 
-int miiphy_write (unsigned char addr, unsigned char reg, unsigned short value)
+int emac4xx_miiphy_write (char *devname, unsigned char addr,
+               unsigned char reg, unsigned short value)
 {
        unsigned long sta_reg;  /* STA scratch area */
        unsigned long i;