Message ID | 1460042230-15205-5-git-send-email-mugunthanvnm@ti.com |
---|---|
State | Accepted |
Commit | b2003c5458e883c691f3a7f5f770e6ed36e1b9d7 |
Delegated to: | Joe Hershberger |
Headers | show |
On Thu, Apr 07, 2016 at 08:47:03PM +0530, Mugunthan V N wrote: > On some boards number of slaves can be 1 when only one port > ethernet is pinned out. So do not break when slave_index and > num slaves check fails, instead continue to parse the next > child. > > Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com>
diff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c index 7104754..971ebf0 100644 --- a/drivers/net/cpsw.c +++ b/drivers/net/cpsw.c @@ -1209,10 +1209,8 @@ static int cpsw_eth_ofdata_to_platdata(struct udevice *dev) if (!strncmp(name, "slave", 5)) { u32 phy_id[2]; - if (slave_index >= priv->data.slaves) { - printf("error: num slaves and slave nodes did not match\n"); - return -EINVAL; - } + if (slave_index >= priv->data.slaves) + continue; phy_mode = fdt_getprop(fdt, subnode, "phy-mode", NULL); if (phy_mode) priv->data.slave_data[slave_index].phy_if =
On some boards number of slaves can be 1 when only one port ethernet is pinned out. So do not break when slave_index and num slaves check fails, instead continue to parse the next child. Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com> --- drivers/net/cpsw.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)