Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp1186284pxb; Fri, 20 Nov 2020 03:29:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJzW+HI3klTfzYASHCbkvzIuMe/f36pUSbpXI8EnG3uOiMHJyNQcuaPY68rMihsfBwk9/idp X-Received: by 2002:a50:99c3:: with SMTP id n3mr35569275edb.213.1605871759723; Fri, 20 Nov 2020 03:29:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605871759; cv=none; d=google.com; s=arc-20160816; b=gnaseQQjojtcJvlwA/APDTadg4Y+HM3BQG8xhDv2e6kiXZIFGAi26MiIQ+B3QnlzOK yDyHqUCapBt1EW/pBCGIyG7A7fGcLSNn4PcRi7ak28pT5Ic/7Elys5kMtNMbopUvdaUN lCmVCz7Kh6Nj+KG1vNFp2TdQmwjZH1vBf4S5HCFTMnTysOz25/BYKVlpQnG4TACeeR97 Yvl1MPNNqSg3rLur11GkuZGREV/uMnw8NY7tTMPdU9Zm8SDmHOUBaA5/VscqY+ExZtAi sQbllrtOl5FNfxv+kmK0J3BUeWckCi2yMxO2GPJ11S+u2/rhoDMcFnz3LfOkHGhcWadG 9uMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=nml//N7IsDoCGRDNDl/em4+I+Bf4WwVoR305+cMQ2ZY=; b=mNUrsV+Tuxc8owCRtE3LYRGejqBjcs89zU6x/Jy8/ueSOVjduXQ9FMgutVNyfY/UWO F46pFkO+bQ6d9zdcA/jM0XiBZasaPfnLsUHuRXaemU9CysVISiQEGk3MpRE01carHATu /7tAoHKPfLydbaLKNX+ckuZ6lJOmZHZpnVHao0hktK5dHcCLGJnKr645H8keiABjWo2y 9QA1Sgh4MP5iSLgHegVkbuna7auyUk/02G53w9lQalxatQ3fiIr2b9HHY3vFLjKOBxlf hunp733opze/gdgF1TMH59vSfJn2s7aQVFAr56ymYHxeBo2NXNKlXd/8qQS26QPJXh0P ldzg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f12si1476060ejb.687.2020.11.20.03.28.56; Fri, 20 Nov 2020 03:29:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727678AbgKTLYv (ORCPT + 99 others); Fri, 20 Nov 2020 06:24:51 -0500 Received: from mailout05.rmx.de ([94.199.90.90]:36604 "EHLO mailout05.rmx.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727677AbgKTLYv (ORCPT ); Fri, 20 Nov 2020 06:24:51 -0500 Received: from kdin02.retarus.com (kdin02.dmz1.retloc [172.19.17.49]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout05.rmx.de (Postfix) with ESMTPS id 4CcvMy3lB6z9sY0; Fri, 20 Nov 2020 12:24:46 +0100 (CET) Received: from mta.arri.de (unknown [217.111.95.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by kdin02.retarus.com (Postfix) with ESMTPS id 4CcvLd3kWDz2TSBc; Fri, 20 Nov 2020 12:23:37 +0100 (CET) Received: from N95HX1G2.wgnetz.xx (192.168.54.143) by mta.arri.de (192.168.100.104) with Microsoft SMTP Server (TLS) id 14.3.487.0; Fri, 20 Nov 2020 12:22:38 +0100 From: Christian Eggers To: Vladimir Oltean , Jakub Kicinski , Andrew Lunn , Rob Herring CC: Richard Cochran , Vivien Didelot , "David S . Miller" , "Kurt Kanzenbach" , Marek Vasut , Codrin Ciubotariu , Tristram Ha , Woojung Huh , Microchip Linux Driver Support , "Christian Eggers" , , , Subject: [PATCH net-next 2/4] net: dsa: microchip: support for "ethernet-ports" node Date: Fri, 20 Nov 2020 12:21:05 +0100 Message-ID: <20201120112107.16334-3-ceggers@arri.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201120112107.16334-1-ceggers@arri.de> References: <20201120112107.16334-1-ceggers@arri.de> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [192.168.54.143] X-RMX-ID: 20201120-122339-4CcvLd3kWDz2TSBc-0@kdin02 X-RMX-SOURCE: 217.111.95.66 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The dsa.yaml device tree binding allows "ethernet-ports" (preferred) and "ports". Signed-off-by: Christian Eggers Reviewed-by: Vladimir Oltean --- drivers/net/dsa/microchip/ksz_common.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c index 71cd1828e25d..a135fd5a9264 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -427,7 +427,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", -- Christian Eggers Embedded software developer Arnold & Richter Cine Technik GmbH & Co. Betriebs KG Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRA 57918 Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRB 54477 Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninger; Markus Zeiler