summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2009-01-13 11:36:29 +0100
committerMarc Kleine-Budde <mkl@pengutronix.de>2009-01-13 12:12:40 +0100
commitf96f2d8e01a7c859622cac0883b104e431d6ab06 (patch)
tree19c31241d3e80c4295ec5ea8e403c47a66431e2a
parent81b243012772edc9088d51de1e78099ac21c9cec (diff)
downloadbarebox-f96f2d8e01a7c859622cac0883b104e431d6ab06.tar.gz
barebox-f96f2d8e01a7c859622cac0883b104e431d6ab06.tar.xz
[macb] use phy_addr supplied by platform data
The driver was not using the phy address supplied by the platform data. With this patch the miiphy.address is set phy addr supplied by the mac platform data. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r--drivers/net/macb.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 0cb6a3d1e5..0727ffe991 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -97,7 +97,6 @@ struct macb_device {
const struct device *dev;
struct eth_device netdev;
- unsigned short phy_addr;
struct miiphy_device miiphy;
@@ -434,7 +433,7 @@ static int macb_probe(struct device_d *dev)
macb->miiphy.read = macb_phy_read;
macb->miiphy.write = macb_phy_write;
- macb->miiphy.address = 0;
+ macb->miiphy.address = pdata->phy_addr;
macb->miiphy.flags = 0;
macb->miiphy.edev = edev;
macb->flags = pdata->flags;
@@ -444,7 +443,6 @@ static int macb_probe(struct device_d *dev)
macb->tx_ring = xmalloc(sizeof(struct macb_dma_desc));
macb->regs = (void *)dev->map_base;
- macb->phy_addr = pdata->phy_addr;
/*
* Do some basic initialization so that we at least can talk