diff options
| author | Tom Rini <trini@ti.com> | 2014-03-10 14:22:54 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-03-10 14:22:54 -0400 |
| commit | 5495dae7aa9d5cd161e07174d38acac86515c58a (patch) | |
| tree | 848c7f48688aeb5ada1fe221dc5dff4729561814 /drivers/net | |
| parent | c0d297946fd2540c8057eb1589429978da888dbb (diff) | |
| parent | 27019e4a949fc3be2e895ac20839c4d4d119f902 (diff) | |
| download | talos-obmc-uboot-5495dae7aa9d5cd161e07174d38acac86515c58a.tar.gz talos-obmc-uboot-5495dae7aa9d5cd161e07174d38acac86515c58a.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/cpsw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c index 50167aab63..dd6c26a7fb 100644 --- a/drivers/net/cpsw.c +++ b/drivers/net/cpsw.c @@ -656,7 +656,7 @@ static void cpsw_slave_init(struct cpsw_slave *slave, struct cpsw_priv *priv) cpsw_ale_add_mcast(priv, NetBcastAddr, 1 << slave_port); - priv->phy_mask |= 1 << slave->data->phy_id; + priv->phy_mask |= 1 << slave->data->phy_addr; } static struct cpdma_desc *cpdma_desc_alloc(struct cpsw_priv *priv) @@ -948,7 +948,7 @@ static int cpsw_phy_init(struct eth_device *dev, struct cpsw_slave *slave) SUPPORTED_1000baseT_Full); phydev = phy_connect(priv->bus, - CONFIG_PHY_ADDR, + slave->data->phy_addr, dev, slave->data->phy_if); |
