net: dsa: of: Allow ethernet-ports as encapsulating node

Due to unified Ethernet Switch Device Tree Bindings allow for ethernet-ports as
encapsulating node as well.

Signed-off-by: Kurt Kanzenbach <kurt@linutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index e055efff390bf2bc1759fd6a38669c4f697d0399..c0ffc7a2b65f87bda5959423d7ae237f4edfc2dd 100644 (file)
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -727,8 +727,12 @@ static int dsa_switch_parse_ports_of(struct dsa_switch *ds,
 
        ports = of_get_child_by_name(dn, "ports");
        if (!ports) {
-               dev_err(ds->dev, "no ports child node found\n");
-               return -EINVAL;
+               /* The second possibility is "ethernet-ports" */
+               ports = of_get_child_by_name(dn, "ethernet-ports");
+               if (!ports) {
+                       dev_err(ds->dev, "no ports child node found\n");
+                       return -EINVAL;
+               }
        }
 
        for_each_available_child_of_node(ports, port) {