net: dsa: felix: accept "ethernet-ports" OF node name
authorVladimir Oltean <vladimir.oltean@nxp.com>
Thu, 23 Sep 2021 15:35:41 +0000 (18:35 +0300)
committerDavid S. Miller <davem@davemloft.net>
Fri, 24 Sep 2021 13:07:59 +0000 (14:07 +0100)
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>
drivers/net/dsa/ocelot/felix.c

index a3a9636..01c01bd 100644 (file)
@@ -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;
        }