net: dsa: sja1105: be compatible with "ethernet-ports" OF node name
authorVladimir Oltean <vladimir.oltean@nxp.com>
Sun, 30 May 2021 22:59:32 +0000 (01:59 +0300)
committerJakub Kicinski <kuba@kernel.org>
Tue, 1 Jun 2021 05:40:25 +0000 (22:40 -0700)
Since commit f2f3e09396be ("net: dsa: sja1105: be compatible with
"ethernet-ports" OF node name"), DSA supports the "ethernet-ports" name
for the container node of the ports, but the sja1105 driver doesn't,
because it handles some device tree parsing of its own.

Add the second node name as a fallback.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/dsa/sja1105/sja1105_main.c

index 2080f36..4c776bd 100644 (file)
@@ -885,6 +885,8 @@ static int sja1105_parse_dt(struct sja1105_private *priv,
        int rc;
 
        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");
                return -ENODEV;