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=-17.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham 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 9069FC433E0 for ; Fri, 15 Jan 2021 09:35:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 43A27221EF for ; Fri, 15 Jan 2021 09:35:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726385AbhAOJew (ORCPT ); Fri, 15 Jan 2021 04:34:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:46164 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725910AbhAOJev (ORCPT ); Fri, 15 Jan 2021 04:34:51 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4404123447; Fri, 15 Jan 2021 09:34:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1610703258; bh=OKNLTlQKyKn5tOx2TJLSfSa0m89ZdsA7oHQE8VHaB0U=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Km3/cC9zGGC5OlciE4xO4tVv900cDkjHKm7cIZ2/5nwSp3Hyvy5m4VwBhSU/DSZbR TPy1BRSfNtFR1DIDNfvGoArY39Zb/DO5Ao7fceMawN0o4T7qP0zxPKUiVY9YpKJ42j MS0knJAIzLNhFT8OThBnsMbmdrL3F60CSR+GHd0wGyXo02+3EDQJ7Q5QsvQkdTVDXz vtaEbm4zf0pu9E6uAH96pTSCdGrQz1TIAkVq40oo39A9SjIGM/E8ipCzYlA3iOY33e VITWcXXyg0JmQpFdjNp5VGoaUvw/zHJ+VHB1tg/kUtuLZjdtK/CuAQtXiHkTP+qXxO hJvfKW9K1NJ2A== Date: Fri, 15 Jan 2021 17:34:13 +0800 From: Shawn Guo To: Michael Walle 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 Message-ID: <20210115093412.GK28365@dragon> References: <20201229120321.17103-1-michael@walle.cc> <20201229120321.17103-2-michael@walle.cc> <20210111013442.GU28365@dragon> <838c9860e19dcfb18d35cffde773ad93@walle.cc> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <838c9860e19dcfb18d35cffde773ad93@walle.cc> User-Agent: Mutt/1.9.4 (2018-02-28) Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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? Shawn