diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2022-03-14 10:10:24 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-03-14 10:10:24 +0100 |
commit | d8ef1573dfc3475d4f5dffa37cb4444b5d6f21eb (patch) | |
tree | 3a4cc9f9dd8f49f870756ac7e4e834f789037c19 /drivers/net | |
parent | afd64e7ee4928c3104ddff40b3fda6a45bd10b50 (diff) | |
parent | b641580deb8c624373f792a90c38c6ebaaddb719 (diff) | |
download | barebox-d8ef1573dfc3475d4f5dffa37cb4444b5d6f21eb.tar.gz barebox-d8ef1573dfc3475d4f5dffa37cb4444b5d6f21eb.tar.xz |
Merge branch 'for-next/of-deep-probe'
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/cpsw.c | 2 | ||||
-rw-r--r-- | drivers/net/phy/mv88e6xxx/port.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c index 6725c7b9bd..748aa861f1 100644 --- a/drivers/net/cpsw.c +++ b/drivers/net/cpsw.c @@ -1224,7 +1224,7 @@ static void cpsw_add_slave(struct cpsw_slave *slave, struct device_node *child, uint32_t phy_id[2] = {-1, -1}; int ret; - if (!of_find_node_by_name(child, "fixed-link")) { + if (!of_find_node_by_name_address(child, "fixed-link")) { ret = of_property_read_u32_array(child, "phy_id", phy_id, 2); if (!ret) dev_warn(slave->cpsw->dev, "phy_id is deprecated, use phy-handle\n"); diff --git a/drivers/net/phy/mv88e6xxx/port.c b/drivers/net/phy/mv88e6xxx/port.c index ba2b03e18d..79694e5237 100644 --- a/drivers/net/phy/mv88e6xxx/port.c +++ b/drivers/net/phy/mv88e6xxx/port.c @@ -558,7 +558,7 @@ int mv88e6xxx_port_probe(struct mv88e6xxx_chip *chip) struct device_node *port_nodes[DSA_MAX_PORTS] = { NULL }; int err, i; - switch_node = of_find_node_by_name(np, "ports"); + switch_node = of_find_node_by_name_address(np, "ports"); if (!switch_node) return -EINVAL; |