GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 06:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

smc91111: add write_hwaddr

Browse source 
Add smc_write_hwaddr() to set mac address.
Clear dev before use.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
This commit is contained in:
Thomas Chou 2010-10-06 09:16:10 +08:00 • committed by Ben Warren
parent 7b37a27e14
commit 1ca6d0df3e
1 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
drivers/net/smc91111.c
View file

@ -654,6 +654,28 @@ again:
return length; return length;
} }
static int smc_write_hwaddr(struct eth_device *dev)
{
int i;
swap_to(ETHERNET);
SMC_SELECT_BANK (dev, 1);
#ifdef USE_32_BIT
for (i = 0; i < 6; i += 2) {
word address;
address = dev->enetaddr[i + 1] << 8;
address |= dev->enetaddr[i];
SMC_outw(dev, address, (ADDR0_REG + i));
}
#else
for (i = 0; i < 6; i++)
SMC_outb(dev, dev->enetaddr[i], (ADDR0_REG + i));
#endif
swap_to(FLASH);
return 0;
}
/* /*
* Open and Initialize the board * Open and Initialize the board
* *
@ -662,8 +684,6 @@ again:
*/ */
static int smc_init(struct eth_device *dev, bd_t *bd) static int smc_init(struct eth_device *dev, bd_t *bd)
{ {
int i;
swap_to(ETHERNET); swap_to(ETHERNET);
PRINTK2 ("%s: smc_init\n", SMC_DEV_NAME); PRINTK2 ("%s: smc_init\n", SMC_DEV_NAME);
@ -680,20 +700,6 @@ static int smc_init(struct eth_device *dev, bd_t *bd)
/* conservative setting (10Mbps, HalfDuplex, no AutoNeg.) */ /* conservative setting (10Mbps, HalfDuplex, no AutoNeg.) */
/* SMC_SELECT_BANK(dev, 0); */ /* SMC_SELECT_BANK(dev, 0); */
/* SMC_outw(dev, 0, RPC_REG); */ /* SMC_outw(dev, 0, RPC_REG); */
SMC_SELECT_BANK (dev, 1);
#ifdef USE_32_BIT
for (i = 0; i < 6; i += 2) {
word address;
address = dev->enetaddr[i + 1] << 8;
address |= dev->enetaddr[i];
SMC_outw(dev, address, (ADDR0_REG + i));
}
#else
for (i = 0; i < 6; i++)
SMC_outb(dev, dev->enetaddr[i], (ADDR0_REG + i));
#endif
printf(SMC_DEV_NAME ": MAC %pM\n", dev->enetaddr); printf(SMC_DEV_NAME ": MAC %pM\n", dev->enetaddr);
@ -1360,6 +1366,7 @@ int smc91111_initialize(u8 dev_num, int base_addr)
return 0; return 0;
} }
memset(dev, 0, sizeof(*dev));
priv->dev_num = dev_num; priv->dev_num = dev_num;
dev->priv = priv; dev->priv = priv;
dev->iobase = base_addr; dev->iobase = base_addr;
@ -1374,6 +1381,7 @@ int smc91111_initialize(u8 dev_num, int base_addr)
dev->halt = smc_halt; dev->halt = smc_halt;
dev->send = smc_send; dev->send = smc_send;
dev->recv = smc_rcv; dev->recv = smc_rcv;
dev->write_hwaddr = smc_write_hwaddr;
sprintf(dev->name, "%s-%hu", SMC_DEV_NAME, dev_num); sprintf(dev->name, "%s-%hu", SMC_DEV_NAME, dev_num);
eth_register(dev); eth_register(dev);