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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC25AC433EF for ; Tue, 3 May 2022 23:47:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232653AbiECXuz (ORCPT ); Tue, 3 May 2022 19:50:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230087AbiECXuz (ORCPT ); Tue, 3 May 2022 19:50:55 -0400 Received: from gloria.sntech.de (gloria.sntech.de [185.11.138.130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13A4E427ED; Tue, 3 May 2022 16:47:19 -0700 (PDT) Received: from ip5b412258.dynamic.kabel-deutschland.de ([91.65.34.88] helo=phil.localnet) by gloria.sntech.de with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nm2Ea-0004eV-To; Wed, 04 May 2022 01:47:12 +0200 From: Heiko Stuebner To: krzk+dt@kernel.org, palmer@dabbelt.com, robh+dt@kernel.org, linux-riscv@lists.infradead.org Cc: conor.dooley@microchip.com, Cyril.Jean@microchip.com, daire.mcnamara@microchip.com, paul.walmsley@sifive.com, aou@eecs.berkeley.edu, palmer@rivosinc.com, arnd@arndb.de, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Conor Dooley Subject: Re: [PATCH v3 5/8] riscv: dts: microchip: make the fabric dtsi board specific Date: Wed, 04 May 2022 01:47:12 +0200 Message-ID: <1892011.PYKUYFuaPT@phil> In-Reply-To: <20220501192557.2631936-6-mail@conchuod.ie> References: <20220501192557.2631936-1-mail@conchuod.ie> <20220501192557.2631936-6-mail@conchuod.ie> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Am Sonntag, 1. Mai 2022, 21:25:56 CEST schrieb Conor Dooley: > From: Conor Dooley > > Currently mpfs-fabric.dtsi is included by mpfs.dtsi - which is fine > currently since there is only one board with this SoC upstream. > > However if another board was added, it would include the fabric contents > of the Icicle Kit's reference design. To avoid this, rename > mpfs-fabric.dtsi to mpfs-icicle-kit-fabric.dtsi & include it in the dts > rather than mpfs.dtsi. > > Signed-off-by: Conor Dooley > --- > .../microchip/{mpfs-fabric.dtsi => mpfs-icicle-kit-fabric.dtsi} | 2 ++ > arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts | 1 + > arch/riscv/boot/dts/microchip/mpfs.dtsi | 1 - > 3 files changed, 3 insertions(+), 1 deletion(-) > rename arch/riscv/boot/dts/microchip/{mpfs-fabric.dtsi => mpfs-icicle-kit-fabric.dtsi} (91%) > > diff --git a/arch/riscv/boot/dts/microchip/mpfs-fabric.dtsi b/arch/riscv/boot/dts/microchip/mpfs-icicle-kit-fabric.dtsi > similarity index 91% > rename from arch/riscv/boot/dts/microchip/mpfs-fabric.dtsi > rename to arch/riscv/boot/dts/microchip/mpfs-icicle-kit-fabric.dtsi > index ccaac3371cf9..0d28858b83f2 100644 > --- a/arch/riscv/boot/dts/microchip/mpfs-fabric.dtsi > +++ b/arch/riscv/boot/dts/microchip/mpfs-icicle-kit-fabric.dtsi > @@ -2,6 +2,8 @@ > /* Copyright (c) 2020-2021 Microchip Technology Inc */ > > / { > + compatible = "microchip,mpfs-icicle-reference-rtlv2203", "microchip,mpfs"; > + I don't really understand the meaning of the added compatible yet. It will get overridden by the compatible in the dts and also the fabric dtsi for the polarberry does not contain a similar thing. > core_pwm0: pwm@41000000 { > compatible = "microchip,corepwm-rtl-v4"; > reg = <0x0 0x41000000 0x0 0xF0>; > diff --git a/arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts b/arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts > index 84b0015dfd47..739dfa52bed1 100644 > --- a/arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts > +++ b/arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts > @@ -4,6 +4,7 @@ > /dts-v1/; > > #include "mpfs.dtsi" > +#include "mpfs-icicle-kit-fabric.dtsi" > > /* Clock frequency (in Hz) of the rtcclk */ > #define RTCCLK_FREQ 1000000 > diff --git a/arch/riscv/boot/dts/microchip/mpfs.dtsi b/arch/riscv/boot/dts/microchip/mpfs.dtsi > index cc3386068c2d..695c4e2807f5 100644 > --- a/arch/riscv/boot/dts/microchip/mpfs.dtsi > +++ b/arch/riscv/boot/dts/microchip/mpfs.dtsi > @@ -3,7 +3,6 @@ > > /dts-v1/; > #include "dt-bindings/clock/microchip,mpfs-clock.h" > -#include "mpfs-fabric.dtsi" > > / { > #address-cells = <2>; >