new at91_emac network driver (NET_MULTI api)

[u-boot] / drivers / net / smc911x.c

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index c027abe9f7b1661f4556079a9f588ee5c255156a..cac08d0a7cccac93058fef90009316f02420114c 100644 (file)
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -37,7 +37,7 @@ void pkt_data_push(struct eth_device *dev, u32 addr, u32 val) \
 
 #define mdelay(n)       udelay((n)*1000)
 
-static void smx911x_handle_mac_address(struct eth_device *dev)
+static void smc911x_handle_mac_address(struct eth_device *dev)
 {
        unsigned long addrh, addrl;
        uchar *m = dev->enetaddr;
@@ -155,7 +155,7 @@ static int smc911x_init(struct eth_device *dev, bd_t * bd)
        /* Configure the PHY, initialize the link state */
        smc911x_phy_configure(dev);
 
-       smx911x_handle_mac_address(dev);
+       smc911x_handle_mac_address(dev);
 
        /* Turn on Tx + Rx */
        smc911x_enable(dev);
@@ -257,12 +257,15 @@ int smc911x_initialize(u8 dev_num, int base_addr)
 
        addrh = smc911x_get_mac_csr(dev, ADDRH);
        addrl = smc911x_get_mac_csr(dev, ADDRL);
-       dev->enetaddr[0] = addrl;
-       dev->enetaddr[1] = addrl >>  8;
-       dev->enetaddr[2] = addrl >> 16;
-       dev->enetaddr[3] = addrl >> 24;
-       dev->enetaddr[4] = addrh;
-       dev->enetaddr[5] = addrh >> 8;
+       if (!(addrl == 0xffffffff && addrh == 0x0000ffff)) {
+               /* address is obtained from optional eeprom */
+               dev->enetaddr[0] = addrl;
+               dev->enetaddr[1] = addrl >>  8;
+               dev->enetaddr[2] = addrl >> 16;
+               dev->enetaddr[3] = addrl >> 24;
+               dev->enetaddr[4] = addrh;
+               dev->enetaddr[5] = addrh >> 8;
+       }
 
        dev->init = smc911x_init;
        dev->halt = smc911x_halt;