aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/dsa/ocelot/felix.c
diff options
context:
space:
mode:
authorVladimir Oltean <vladimir.oltean@nxp.com>2021-09-23 18:35:41 +0300
committerDavid S. Miller <davem@davemloft.net>2021-09-24 14:07:59 +0100
commitabecbfcdb935af500f47458dd5a1b044c8585c0b (patch)
tree1983cff2d7a6c695f11c2b02ed868ace6fb0c3f7 /drivers/net/dsa/ocelot/felix.c
parentMerge branch 'mlxsw-next' (diff)
downloadlinux-dev-abecbfcdb935af500f47458dd5a1b044c8585c0b.tar.xz
linux-dev-abecbfcdb935af500f47458dd5a1b044c8585c0b.zip
net: dsa: felix: accept "ethernet-ports" OF node name
Since both forms are accepted, let's search for both when we pre-validate the PHY modes. Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r--drivers/net/dsa/ocelot/felix.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
index a3a9636430d6..01c01bd0c854 100644
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@ -955,8 +955,10 @@ static int felix_parse_dt(struct felix *felix, phy_interface_t *port_phy_modes)
switch_node = dev->of_node;
ports_node = of_get_child_by_name(switch_node, "ports");
+ if (!ports_node)
+ ports_node = of_get_child_by_name(switch_node, "ethernet-ports");
if (!ports_node) {
- dev_err(dev, "Incorrect bindings: absent \"ports\" node\n");
+ dev_err(dev, "Incorrect bindings: absent \"ports\" or \"ethernet-ports\" node\n");
return -ENODEV;
}