diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-13 20:03:33 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-13 20:03:33 -0400 |
| commit | 4504062b271bf4d1cf256e4e87e156de6029e088 (patch) | |
| tree | a0cac720a2687f2ed4ccf15f473d06bb7c8dcb07 /drivers/net | |
| parent | 44afdc4a12b9f6f48338e7975e4f08cfe90dba74 (diff) | |
| parent | 42b7600d62ae288a8c12431d232b89b26ec61721 (diff) | |
Merge git://git.denx.de/u-boot-fdt
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/cpsw.c | 2 | ||||
| -rw-r--r-- | drivers/net/keystone_net.c | 4 | ||||
| -rw-r--r-- | drivers/net/mvpp2.c | 2 | ||||
| -rw-r--r-- | drivers/net/sun8i_emac.c | 5 |
4 files changed, 7 insertions, 6 deletions
diff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c index d1f024e0eb..cbce683eea 100644 --- a/drivers/net/cpsw.c +++ b/drivers/net/cpsw.c @@ -1348,7 +1348,7 @@ static int cpsw_eth_ofdata_to_platdata(struct udevice *dev) active_slave = fdtdec_get_int(fdt, node, "active_slave", 0); priv->data.active_slave = active_slave; - fdt_for_each_subnode(fdt, subnode, node) { + fdt_for_each_subnode(subnode, fdt, node) { int len; const char *name; diff --git a/drivers/net/keystone_net.c b/drivers/net/keystone_net.c index e41b7d1365..f88d83e727 100644 --- a/drivers/net/keystone_net.c +++ b/drivers/net/keystone_net.c @@ -990,7 +990,7 @@ static int ks2_eth_bind_slaves(struct udevice *dev, int gbe, int *gbe_0) char *slave_name; interfaces = fdt_subnode_offset(fdt, gbe, "interfaces"); - fdt_for_each_subnode(fdt, slave, interfaces) { + fdt_for_each_subnode(slave, fdt, interfaces) { int slave_no; slave_no = fdtdec_get_int(fdt, slave, "slave-port", -ENOENT); @@ -1015,7 +1015,7 @@ static int ks2_eth_bind_slaves(struct udevice *dev, int gbe, int *gbe_0) } sec_slave = fdt_subnode_offset(fdt, gbe, "secondary-slave-ports"); - fdt_for_each_subnode(fdt, slave, sec_slave) { + fdt_for_each_subnode(slave, fdt, sec_slave) { int slave_no; slave_no = fdtdec_get_int(fdt, slave, "slave-port", -ENOENT); diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c index 340b85a710..405776af95 100644 --- a/drivers/net/mvpp2.c +++ b/drivers/net/mvpp2.c @@ -4153,7 +4153,7 @@ static int mvpp2_base_bind(struct udevice *parent) return -ENOENT; } - fdt_for_each_subnode(blob, subnode, node) { + fdt_for_each_subnode(subnode, blob, node) { /* Skip disabled ports */ if (!fdtdec_get_is_enabled(blob, subnode)) continue; diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index 4c149e1bdf..91570a2910 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -456,8 +456,9 @@ static int parse_phy_pins(struct udevice *dev) for (i = 0; ; i++) { int pin; - if (fdt_get_string_index(gd->fdt_blob, offset, - "allwinner,pins", i, &pin_name)) + pin_name = fdt_stringlist_get(gd->fdt_blob, offset, + "allwinner,pins", i, NULL); + if (!pin_name) break; if (pin_name[0] != 'P') continue; |