From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87F33C433E0 for ; Fri, 15 Jan 2021 09:47:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 31296235F8 for ; Fri, 15 Jan 2021 09:47:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728705AbhAOJqv (ORCPT ); Fri, 15 Jan 2021 04:46:51 -0500 Received: from ssl.serverraum.org ([176.9.125.105]:35451 "EHLO ssl.serverraum.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726849AbhAOJqt (ORCPT ); Fri, 15 Jan 2021 04:46:49 -0500 Received: from ssl.serverraum.org (web.serverraum.org [172.16.0.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ssl.serverraum.org (Postfix) with ESMTPSA id 9A47723E59; Fri, 15 Jan 2021 10:46:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walle.cc; s=mail2016061301; t=1610703974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yW5+sW/iNL6QDHA2UIJPSkV9BAe3+M083pp8li0kZiQ=; b=FzVEPnq5SU6mAMue7gdxjElP/OjMX/6rmMktxfeZb+3KFh/8tyfsuDLGYcZDBMahHQkIXS JPnY4DDNiVDvAnvAaT7ZeJL5Glm9MCf2uxJoEpsRz+bBqYZk6qacG0flxfDUD1KT1KI9Zy JFQhGzTzru+OrUUwP6V6P27LMoloV4U= MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Fri, 15 Jan 2021 10:46:10 +0100 From: Michael Walle To: Shawn Guo Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Rob Herring , Li Yang Subject: Re: [PATCH 2/2] arm64: dts: freescale: sl28: add variant 1 In-Reply-To: <20210115093412.GK28365@dragon> References: <20201229120321.17103-1-michael@walle.cc> <20201229120321.17103-2-michael@walle.cc> <20210111013442.GU28365@dragon> <838c9860e19dcfb18d35cffde773ad93@walle.cc> <20210115093412.GK28365@dragon> User-Agent: Roundcube Webmail/1.4.10 Message-ID: <0f1556f0b7eeaa0704907c291545ed69@walle.cc> X-Sender: michael@walle.cc Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Am 2021-01-15 10:34, schrieb Shawn Guo: > On Mon, Jan 11, 2021 at 09:00:37AM +0100, Michael Walle wrote: >> Am 2021-01-11 02:34, schrieb Shawn Guo: >> > On Tue, Dec 29, 2020 at 01:03:21PM +0100, Michael Walle wrote: >> > > There is a new variant 1 of this board available. It features up to >> > > four >> > > SerDes lanes for customer use. Add a new device tree which features >> > > just >> > > the basic peripherals. A customer will then have to modify or append >> > > to >> > > this device tree. >> > > >> > > Signed-off-by: Michael Walle >> > > --- >> > > arch/arm64/boot/dts/freescale/Makefile | 1 + >> > > .../fsl-ls1028a-kontron-sl28-var1.dts | 61 >> > > +++++++++++++++++++ >> > > 2 files changed, 62 insertions(+) >> > > create mode 100644 >> > > arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var1.dts >> > > >> > > diff --git a/arch/arm64/boot/dts/freescale/Makefile >> > > b/arch/arm64/boot/dts/freescale/Makefile >> > > index 6f0777ee6cd6..79cb0025fcc6 100644 >> > > --- a/arch/arm64/boot/dts/freescale/Makefile >> > > +++ b/arch/arm64/boot/dts/freescale/Makefile >> > > @@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-qds.dtb >> > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-rdb.dtb >> > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += >> > > fsl-ls1028a-kontron-kbox-a-230-ls.dtb >> > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28.dtb >> > > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28-var1.dtb >> > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28-var2.dtb >> > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += >> > > fsl-ls1028a-kontron-sl28-var3-ads2.dtb >> > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28-var4.dtb >> > > diff --git >> > > a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var1.dts >> > > b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var1.dts >> > > new file mode 100644 >> > > index 000000000000..52f2f3ffdce1 >> > > --- /dev/null >> > > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var1.dts >> > > @@ -0,0 +1,61 @@ >> > > +// SPDX-License-Identifier: GPL-2.0+ >> > > +/* >> > > + * Device Tree file for the Kontron SMARC-sAL28 board. >> > > + * >> > > + * This is for the network variant 1 which has one ethernet port. >> > > It is >> > > + * different than the base variant, which also has one port, but >> > > here the >> > > + * port is connected via RGMII. This port is not TSN aware. >> > > + * None of the four SerDes lanes are used by the module, instead >> > > they are >> > > + * all led out to the carrier for customer use. >> > > + * >> > > + * Copyright (C) 2020 Michael Walle >> > > + * >> > > + */ >> > > + >> > > +/dts-v1/; >> > > +#include "fsl-ls1028a-kontron-sl28.dts" >> > > +#include >> > > + >> > > +/ { >> > > + model = "Kontron SMARC-sAL28 (4 Lanes)"; >> > > + compatible = "kontron,sl28-var1", "kontron,sl28", "fsl,ls1028a"; >> > > +}; >> > > + >> > > +&enetc_port0 { >> > > + status = "disabled"; >> > > + /delete-property/ phy-handle; >> > > + /delete-node/ mdio; >> > >> > As it's disabled anyway, why do we bother to delete the property and >> > child node? >> >> Because beneath that node is also the old phy0 label. So you'd be >> getting >> arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var1.dts:38.24-55.5: >> ERROR (duplicate_label): >> /soc/pcie@1f0000000/ethernet@0,1/mdio/ethernet-phy@4: Duplicate label >> 'phy0' >> on /soc/pcie@1f0000000/ethernet@0,1/mdio/ethernet-phy@4 and >> /soc/pcie@1f0000000/ethernet@0,0/mdio/ethernet-phy@5 > > So labelling enetc_port1 phy as 'phy1' would fix it, right? That might fix it, but I don't want an old unused phy node in the device tree which isn't even there. Also I don't want one board starting the labels with phy0 and the other with phy1. If you don't like that /delete-node/ stuff, I'd have to reorganize the includes. var1 and var2 unfortunately isn't compatible with the base variant fsl-ls1028a-kontron-sl28.dts regarding the phy configurations. Thus I'd probably have to split "fsl-ls1028a-kontron-sl28.dts" into a common dtsi and one which handles the networking. -michael