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.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 82415C433EF for ; Fri, 17 Sep 2021 12:01:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5FCB3611C8 for ; Fri, 17 Sep 2021 12:01:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242895AbhIQMCh (ORCPT ); Fri, 17 Sep 2021 08:02:37 -0400 Received: from gloria.sntech.de ([185.11.138.130]:54960 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242369AbhIQMCg (ORCPT ); Fri, 17 Sep 2021 08:02:36 -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 1mRCYK-0005JE-GG; Fri, 17 Sep 2021 14:01:12 +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 Cc: Rob Herring , Liang Chen , Peter Geis , Simon Xue , Michael Riesch Subject: Re: [PATCH] arm64: dts: rockchip: move aliases to rk356x dtsi Date: Fri, 17 Sep 2021 14:01:11 +0200 Message-ID: <2397289.mVTDCA6dLn@diego> In-Reply-To: <20210917110528.24454-1-michael.riesch@wolfvision.net> References: <20210917110528.24454-1-michael.riesch@wolfvision.net> 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 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 ;-) 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; >