* Patch by Rahul Shanbhag, 19 Feb 2004:

[platform/kernel/u-boot.git] / drivers / eepro100.c

diff --git a/drivers/eepro100.c b/drivers/eepro100.c
index a0bb76d..906159e 100644 (file)
--- a/drivers/eepro100.c
+++ b/drivers/eepro100.c
@@ -248,8 +248,13 @@ static int eepro100_send (struct eth_device *dev, volatile void *packet,
 static int eepro100_recv (struct eth_device *dev);
 static void eepro100_halt (struct eth_device *dev);
 
+#if defined(CONFIG_E500) || defined(CONFIG_DB64360) || defined(CONFIG_DB64460)
+#define bus_to_phys(a) (a)
+#define phys_to_bus(a) (a)
+#else
 #define bus_to_phys(a) pci_mem_to_phys((pci_dev_t)dev->priv, a)
 #define phys_to_bus(a) pci_phys_to_mem((pci_dev_t)dev->priv, a)
+#endif
 
 static inline int INW (struct eth_device *dev, u_long addr)
 {
@@ -679,11 +684,11 @@ int eepro100_write_eeprom (struct eth_device* dev, int location, int addr_len, u
     /* Shift the enable command bits out. */
     for (i = (addr_len+EE_CMD_BITS-1); i >= 0; i--)
     {
-        dataval = (enable_cmd & (1 << i)) ? EE_DATA_WRITE : 0;
-        OUTW(dev, EE_ENB | dataval, SCBeeprom);
-        udelay(1);
-        OUTW(dev, EE_ENB | dataval | EE_SHIFT_CLK, SCBeeprom);
-        udelay(1);
+       dataval = (enable_cmd & (1 << i)) ? EE_DATA_WRITE : 0;
+       OUTW(dev, EE_ENB | dataval, SCBeeprom);
+       udelay(1);
+       OUTW(dev, EE_ENB | dataval | EE_SHIFT_CLK, SCBeeprom);
+       udelay(1);
     }
 
     OUTW(dev, EE_ENB, SCBeeprom);
@@ -696,11 +701,11 @@ int eepro100_write_eeprom (struct eth_device* dev, int location, int addr_len, u
     /* Shift the write command bits out. */
     for (i = (addr_len+EE_CMD_BITS-1); i >= 0; i--)
     {
-        dataval = (write_cmd & (1 << i)) ? EE_DATA_WRITE : 0;
-        OUTW(dev, EE_ENB | dataval, SCBeeprom);
-        udelay(1);
-        OUTW(dev, EE_ENB | dataval | EE_SHIFT_CLK, SCBeeprom);
-        udelay(1);
+       dataval = (write_cmd & (1 << i)) ? EE_DATA_WRITE : 0;
+       OUTW(dev, EE_ENB | dataval, SCBeeprom);
+       udelay(1);
+       OUTW(dev, EE_ENB | dataval | EE_SHIFT_CLK, SCBeeprom);
+       udelay(1);
     }
 
     /* Write the data */
@@ -730,17 +735,17 @@ int eepro100_write_eeprom (struct eth_device* dev, int location, int addr_len, u
     tmplong = 10;
     do
     {
-        dataval = INW(dev, SCBeeprom);
-        if (dataval & EE_DATA_READ)
-            break;
-        udelay(10000);
+       dataval = INW(dev, SCBeeprom);
+       if (dataval & EE_DATA_READ)
+           break;
+       udelay(10000);
     }
     while (-- tmplong);
 
     if (tmplong == 0)
     {
-        printf ("Write i82559 eeprom timed out (100 ms waiting for data ready.\n");
-        return -1;
+       printf ("Write i82559 eeprom timed out (100 ms waiting for data ready.\n");
+       return -1;
     }
 
     /* Terminate the EEPROM access. */