summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDavid Andrey <david.andrey@netmodule.com>2013-04-04 19:13:07 +0200
committerMichal Simek <michal.simek@xilinx.com>2013-04-30 11:39:23 +0200
commit117cd4cc103443b442afc4d48c8d3920f6c171c0 (patch)
tree7232bd81036fc2d206b308e2e6159fa94a314b0a /drivers
parent7193653e8dddf8f232c19e16a4ca3c5052c71f09 (diff)
downloadu-boot-imx-117cd4cc103443b442afc4d48c8d3920f6c171c0.zip
u-boot-imx-117cd4cc103443b442afc4d48c8d3920f6c171c0.tar.gz
u-boot-imx-117cd4cc103443b442afc4d48c8d3920f6c171c0.tar.bz2
net: gem: Pass phy address to init
Pass the PHY address to the driver init to allow parallel use of both interfaces Signed-off-by: David Andrey <david.andrey@netmodule.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/zynq_gem.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index 2d717e9..316816d 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -427,7 +427,7 @@ static int zynq_gem_miiphy_write(const char *devname, uchar addr,
return phywrite(dev, addr, reg, val);
}
-int zynq_gem_initialize(bd_t *bis, int base_addr)
+int zynq_gem_initialize(bd_t *bis, int base_addr, int phy_addr)
{
struct eth_device *dev;
struct zynq_gem_priv *priv;
@@ -443,11 +443,7 @@ int zynq_gem_initialize(bd_t *bis, int base_addr)
}
priv = dev->priv;
-#ifdef CONFIG_PHY_ADDR
- priv->phyaddr = CONFIG_PHY_ADDR;
-#else
- priv->phyaddr = -1;
-#endif
+ priv->phyaddr = phy_addr;
sprintf(dev->name, "Gem.%x", base_addr);