leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://git.denx.de/u-boot-fdt

Browse Source
This commit is contained in:
Tom Rini
2016-10-13 20:03:33 -04:00
parent 44afdc4a12 42b7600d62
commit 4504062b27
38 changed files with 299 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/cpsw.c
View File

@@ -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;

4
drivers/net/keystone_net.c
View File

@@ -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);

2
drivers/net/mvpp2.c
View File

@@ -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;

5
drivers/net/sun8i_emac.c
View File

@@ -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;