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

net: cpsw: Allow multiple slaves 

The driver is ready now for handling both slaved, so add support
for it.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2014-05-14 16:48:26 +02:00
parent 6322a0305f
commit 26576f8ef5
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/cpsw.c
View File

@ -572,9 +572,6 @@ static void cpsw_slave_update_link(struct cpsw_slave *slave,
if (!phydev)
return;
if (slave->slave_num)
return;
if (phydev->link) {
*link = 1;
mac_control = BIT(5); /* MIIEN */
@ -1096,9 +1093,6 @@ static int cpsw_probe_dt(struct cpsw_priv *priv)
cpsw_gmii_sel_am335x(slave);
}
/* Only one slave supported by this driver */
priv->num_slaves = 1;
return 0;
}
@ -1110,7 +1104,7 @@ int cpsw_probe(struct device_d *dev)
uint64_t start;
uint32_t phy_mask;
struct cpsw_data *cpsw_data;
int ret;
int i, ret;
dev_dbg(dev, "* %s\n", __func__);
@ -1202,9 +1196,11 @@ int cpsw_probe(struct device_d *dev)
mdiobus_register(&priv->miibus);
ret = cpsw_slave_setup(&priv->slaves[0], 0, priv);
if (ret)
goto out;
for (i = 0; i < priv->num_slaves; i++) {
ret = cpsw_slave_setup(&priv->slaves[i], i, priv);
if (ret)
goto out;
}
return 0;
out: