net: dsa: microchip: support for "ethernet-ports" node
authorChristian Eggers <ceggers@arri.de>
Fri, 20 Nov 2020 11:21:05 +0000 (12:21 +0100)
committerJakub Kicinski <kuba@kernel.org>
Thu, 26 Nov 2020 01:53:45 +0000 (17:53 -0800)
The dsa.yaml device tree binding allows "ethernet-ports" (preferred) and
"ports".

Signed-off-by: Christian Eggers <ceggers@arri.de>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/dsa/microchip/ksz_common.c

index 0ef854911f215fab3d9af019fea6b418160e4ea6..7002436e62b487caa045657d3004f6680cd86936 100644 (file)
@@ -426,7 +426,9 @@ int ksz_switch_register(struct ksz_device *dev,
                ret = of_get_phy_mode(dev->dev->of_node, &interface);
                if (ret == 0)
                        dev->compat_interface = interface;
-               ports = of_get_child_by_name(dev->dev->of_node, "ports");
+               ports = of_get_child_by_name(dev->dev->of_node, "ethernet-ports");
+               if (!ports)
+                       ports = of_get_child_by_name(dev->dev->of_node, "ports");
                if (ports)
                        for_each_available_child_of_node(ports, port) {
                                if (of_property_read_u32(port, "reg",