sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

dm9000: read the mac address from the register if none are specified 

as barebox can be run as a second stage the first stage may have init it
before so re-used it

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2011-02-23 18:03:58 +01:00 committed by Sascha Hauer
parent 065c2b4702
commit a0c1644d84
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/dm9000.c
View File

@ -169,6 +169,7 @@ struct dm9000_priv {
void __iomem *iodata; void __iomem *iodata;
struct mii_device miidev; struct mii_device miidev;
int buswidth; int buswidth;
int srom;
}; };
#ifdef CONFIG_DM9000_DEBUG #ifdef CONFIG_DM9000_DEBUG
@ -433,12 +434,17 @@ static u16 read_srom_word(struct dm9000_priv *priv, int offset)
static int dm9000_get_ethaddr(struct eth_device *edev, unsigned char *adr) static int dm9000_get_ethaddr(struct eth_device *edev, unsigned char *adr)
{ {
struct dm9000_priv *priv = (struct dm9000_priv *)edev->priv; struct dm9000_priv *priv = (struct dm9000_priv *)edev->priv;
int i; int i, oft;
for (i = 0; i < 3; i++) if (priv->srom) {
((u16 *) adr)[i] = read_srom_word(priv, i); for (i = 0; i < 3; i++)
((u16 *) adr)[i] = read_srom_word(priv, i);
} else {
for (i = 0, oft = 0x10; i < 6; i++, oft++)
adr[i] = DM9000_ior(priv, oft);
}
return 0; return 0;
} }
static int dm9000_set_ethaddr(struct eth_device *edev, unsigned char *adr) static int dm9000_set_ethaddr(struct eth_device *edev, unsigned char *adr)
@ -491,6 +497,7 @@ static int dm9000_probe(struct device_d *dev)
priv->buswidth = pdata->buswidth; priv->buswidth = pdata->buswidth;
priv->iodata = (void *)pdata->iodata; priv->iodata = (void *)pdata->iodata;
priv->iobase = (void *)pdata->iobase; priv->iobase = (void *)pdata->iobase;
priv->srom = pdata->srom;
edev->init = dm9000_init_dev; edev->init = dm9000_init_dev;
edev->open = dm9000_eth_open; edev->open = dm9000_eth_open;
@ -498,8 +505,7 @@ static int dm9000_probe(struct device_d *dev)
edev->recv = dm9000_eth_rx; edev->recv = dm9000_eth_rx;
edev->halt = dm9000_eth_halt; edev->halt = dm9000_eth_halt;
edev->set_ethaddr = dm9000_set_ethaddr; edev->set_ethaddr = dm9000_set_ethaddr;
if (pdata->srom) edev->get_ethaddr = dm9000_get_ethaddr;
edev->get_ethaddr = dm9000_get_ethaddr;
/* RESET device */ /* RESET device */
dm9000_reset(priv); dm9000_reset(priv);