Merge branch 'master' of git://git.denx.de/u-boot-arm

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

diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index b912e44650681f29c9b1ecf89499686c0ce4ddfe..34cc47f39230d13f38caae1d58b5b31e224bc530 100644 (file)
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -215,13 +215,14 @@ static inline void ethoc_write_bd(struct eth_device *dev, int index,
        ethoc_write(dev, offset + 4, bd->addr);
 }
 
-static inline void ethoc_set_mac_address(struct eth_device *dev)
+static int ethoc_set_mac_address(struct eth_device *dev)
 {
        u8 *mac = dev->enetaddr;
 
        ethoc_write(dev, MAC_ADDR0, (mac[2] << 24) | (mac[3] << 16) |
                    (mac[4] << 8) | (mac[5] << 0));
        ethoc_write(dev, MAC_ADDR1, (mac[0] << 8) | (mac[1] << 0));
+       return 0;
 }
 
 static inline void ethoc_ack_irq(struct eth_device *dev, u32 mask)
@@ -308,8 +309,6 @@ static int ethoc_init(struct eth_device *dev, bd_t * bd)
        struct ethoc *priv = (struct ethoc *)dev->priv;
        printf("ethoc\n");
 
-       ethoc_set_mac_address(dev);
-
        priv->num_tx = 1;
        priv->num_rx = PKTBUFSRX;
        ethoc_write(dev, TX_BD_NUM, priv->num_tx);
@@ -504,6 +503,7 @@ int ethoc_initialize(u8 dev_num, int base_addr)
        dev->halt = ethoc_halt;
        dev->send = ethoc_send;
        dev->recv = ethoc_recv;
+       dev->write_hwaddr = ethoc_set_mac_address;
        sprintf(dev->name, "%s-%hu", "ETHOC", dev_num);
 
        eth_register(dev);