From: Michael Riesch <michael.riesch@wolfvision.net>
To: "Heiko Stübner" <heiko@sntech.de>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: Rob Herring <robh+dt@kernel.org>, Liang Chen <cl@rock-chips.com>,
Peter Geis <pgwipeout@gmail.com>, Simon Xue <xxm@rock-chips.com>
Subject: Re: [PATCH] arm64: dts: rockchip: move aliases to rk356x dtsi
Date: Fri, 17 Sep 2021 14:09:17 +0200 [thread overview]
Message-ID: <4574b70a-3979-f04b-221b-5cadfbfcd07d@wolfvision.net> (raw)
In-Reply-To: <2397289.mVTDCA6dLn@diego>
Hi Heiko,
On 9/17/21 2:01 PM, 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 ;-)
OK, I was not aware of this. Some SoC families (e.g., Freescale IMX)
have those aliases in the dtsi and I was not sure what the desired
approach was. Thanks for the clarification.
Best regards,
Michael
>
> Heiko
>
>
>>
>> Signed-off-by: Michael Riesch <michael.riesch@wolfvision.net>
>> ---
>> 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;
>>
>
>
>
>
next prev parent reply other threads:[~2021-09-17 12:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-17 11:05 Michael Riesch
2021-09-17 12:01 ` Heiko Stübner
2021-09-17 12:09 ` Michael Riesch [this message]
2021-09-22 13:40 ` Ahmad Fatoum
2021-09-22 16:51 ` Heiko Stübner
2021-09-23 19:48 ` Ahmad Fatoum
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4574b70a-3979-f04b-221b-5cadfbfcd07d@wolfvision.net \
--to=michael.riesch@wolfvision.net \
--cc=cl@rock-chips.com \
--cc=devicetree@vger.kernel.org \
--cc=heiko@sntech.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=pgwipeout@gmail.com \
--cc=robh+dt@kernel.org \
--cc=xxm@rock-chips.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®