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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 01E71C433EF for ; Wed, 22 Sep 2021 16:51:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DECE8611C9 for ; Wed, 22 Sep 2021 16:51:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236712AbhIVQwx convert rfc822-to-8bit (ORCPT ); Wed, 22 Sep 2021 12:52:53 -0400 Received: from gloria.sntech.de ([185.11.138.130]:51050 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236697AbhIVQwk (ORCPT ); Wed, 22 Sep 2021 12:52:40 -0400 Received: from ip5f5a6e92.dynamic.kabel-deutschland.de ([95.90.110.146] helo=diego.localnet) by gloria.sntech.de with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mT5Sf-0001QK-8r; Wed, 22 Sep 2021 18:51:09 +0200 From: Heiko =?ISO-8859-1?Q?St=FCbner?= To: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Michael Riesch , Arnd Bergmann , Ahmad Fatoum Cc: Rob Herring , Liang Chen , Peter Geis , Simon Xue , Pengutronix Kernel Team Subject: Re: [PATCH] arm64: dts: rockchip: move aliases to rk356x dtsi Date: Wed, 22 Sep 2021 18:51:08 +0200 Message-ID: <8375423.X1v87zm6sT@diego> In-Reply-To: References: <20210917110528.24454-1-michael.riesch@wolfvision.net> <2397289.mVTDCA6dLn@diego> MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT Content-Type: text/plain; charset="iso-8859-1" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Ahmad, Am Mittwoch, 22. September 2021, 15:40:33 CEST schrieb Ahmad Fatoum: > Hello Heiko, > > On 17.09.21 14:01, Heiko Stübner wrote: > > Hi Michael, > > > > Am Freitag, 17. September 2021, 13:05:28 CEST schrieb Michael Riesch: > >> In order to ensure deterministic probe order over different boards, > >> move the aliases of on-SoC components to the corresponding dtsi > >> files. > > > > please read the git history on the other Rockchip SoCs. We just moved > > the aliases on them _to_ the board-files, as requested by > > arm-soc maintainers ;-) > > [Adding Arnd to CC] > > For old boards, changing the aliases may introduce breakage that outweighs > the benefit of having consistent numbering. This doesn't seem to apply here: > rk3566.dtsi is a new device tree not yet in v5.15-rc2 and rk3568 is new in > v5.14 and has only one board partially supported, so if we were to do this > change we should do it now. Boards will still be free to override the aliases, > but those that don't will have consistent numbering regardless of whether > nodes are enabled, cards are detected or probe order. the request from Arnd was actually to move things like mmc aliases _to_ board files away from the soc-level dtsi. Supposedly to prevent holes in the numbering for example if the sdmmc is mmc0, emmc is mmc1, but sdmmc not used on a board, which would then leave mmc0 empty . Heiko > > Heiko > > > > > >> > >> Signed-off-by: Michael Riesch > >> --- > >> arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 6 ------ > >> arch/arm64/boot/dts/rockchip/rk3566.dtsi | 4 ++++ > >> arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 7 ------- > >> arch/arm64/boot/dts/rockchip/rk3568.dtsi | 5 +++++ > >> arch/arm64/boot/dts/rockchip/rk356x.dtsi | 2 ++ > >> 5 files changed, 11 insertions(+), 13 deletions(-) > >> > >> diff --git a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts > >> index a244f7b87e38..156bbb8aa4c4 100644 > >> --- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts > >> +++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts > >> @@ -10,12 +10,6 @@ > >> model = "Pine64 RK3566 Quartz64-A Board"; > >> compatible = "pine64,quartz64-a", "rockchip,rk3566"; > >> > >> - aliases { > >> - ethernet0 = &gmac1; > >> - mmc0 = &sdmmc0; > >> - mmc1 = &sdhci; > >> - }; > >> - > >> chosen: chosen { > >> stdout-path = "serial2:1500000n8"; > >> }; > >> diff --git a/arch/arm64/boot/dts/rockchip/rk3566.dtsi b/arch/arm64/boot/dts/rockchip/rk3566.dtsi > >> index 3839eef5e4f7..c1b3841caa77 100644 > >> --- a/arch/arm64/boot/dts/rockchip/rk3566.dtsi > >> +++ b/arch/arm64/boot/dts/rockchip/rk3566.dtsi > >> @@ -4,6 +4,10 @@ > >> > >> / { > >> compatible = "rockchip,rk3566"; > >> + > >> + aliases { > >> + ethernet0 = &gmac1; > >> + }; > >> }; > >> > >> &power { > >> diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts > >> index 184e2aa2416a..218f85af730c 100644 > >> --- a/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts > >> +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts > >> @@ -13,13 +13,6 @@ > >> model = "Rockchip RK3568 EVB1 DDR4 V10 Board"; > >> compatible = "rockchip,rk3568-evb1-v10", "rockchip,rk3568"; > >> > >> - aliases { > >> - ethernet0 = &gmac0; > >> - ethernet1 = &gmac1; > >> - mmc0 = &sdmmc0; > >> - mmc1 = &sdhci; > >> - }; > >> - > >> chosen: chosen { > >> stdout-path = "serial2:1500000n8"; > >> }; > >> diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi > >> index 2fd313a295f8..dd0e800cf752 100644 > >> --- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi > >> +++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi > >> @@ -8,6 +8,11 @@ > >> / { > >> compatible = "rockchip,rk3568"; > >> > >> + aliases { > >> + ethernet0 = &gmac0; > >> + ethernet1 = &gmac1; > >> + }; > >> + > >> qos_pcie3x1: qos@fe190080 { > >> compatible = "rockchip,rk3568-qos", "syscon"; > >> reg = <0x0 0xfe190080 0x0 0x20>; > >> diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi > >> index e42fbac6147b..bb0540d3008c 100644 > >> --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi > >> +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi > >> @@ -29,6 +29,8 @@ > >> i2c3 = &i2c3; > >> i2c4 = &i2c4; > >> i2c5 = &i2c5; > >> + mmc0 = &sdmmc0; > >> + mmc1 = &sdhci; > >> serial0 = &uart0; > >> serial1 = &uart1; > >> serial2 = &uart2; > >> > > > > > > > > > > > > _______________________________________________ > > linux-arm-kernel mailing list > > linux-arm-kernel@lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > > > > >