From: Heiko Stuebner <heiko@sntech.de>
To: heiko@sntech.de
Cc: jagan@amarulasolutions.com, jbx6244@gmail.com,
robin.murphy@arm.com, linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org,
arnd@kernel.org,
Heiko Stuebner <heiko.stuebner@theobroma-systems.com>
Subject: [PATCH 4/7] arm64: dts: rockchip: move mmc aliases to board dts on rk3308
Date: Wed, 24 Mar 2021 13:22:32 +0100 [thread overview]
Message-ID: <20210324122235.1059292-4-heiko@sntech.de> (raw)
In-Reply-To: <20210324122235.1059292-1-heiko@sntech.de>
From: Heiko Stuebner <heiko.stuebner@theobroma-systems.com>
As suggested by Arnd Bergmann, the newly added mmc aliases
should be board specific, so move them from the general dtsi
to the individual boards.
Suggested-by: Arnd Bergmann <arnd@kernel.org>
Signed-off-by: Heiko Stuebner <heiko.stuebner@theobroma-systems.com>
---
arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 6 ++++++
arch/arm64/boot/dts/rockchip/rk3308.dtsi | 3 ---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
index 7a96be10eaf0..3dddd4742c3a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
@@ -9,6 +9,12 @@
/ {
model = "Firefly ROC-RK3308-CC board";
compatible = "firefly,roc-rk3308-cc", "rockchip,rk3308";
+
+ aliases {
+ mmc0 = &sdmmc;
+ mmc1 = &emmc;
+ };
+
chosen {
stdout-path = "serial2:1500000n8";
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
index 3a035a189450..4ea32e8f33d2 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
@@ -24,9 +24,6 @@ aliases {
i2c1 = &i2c1;
i2c2 = &i2c2;
i2c3 = &i2c3;
- mmc0 = &sdmmc;
- mmc1 = &emmc;
- mmc2 = &sdio;
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
--
2.29.2
next prev parent reply other threads:[~2021-03-24 12:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-24 12:22 [PATCH 1/7] ARM: dts: rockchip: move rk322x mmcx aliases to board dts files Heiko Stuebner
2021-03-24 12:22 ` [PATCH 2/7] ARM: dts: rockchip: move rv1108 " Heiko Stuebner
2021-03-24 12:22 ` [PATCH 3/7] arm64: dts: rockchip: move mmc aliases to board dts on px30 Heiko Stuebner
2021-03-24 12:22 ` Heiko Stuebner [this message]
2021-03-24 12:22 ` [PATCH 5/7] arm64: dts: rockchip: move mmc aliases to board dts on rk3328 Heiko Stuebner
2021-03-24 12:22 ` [PATCH 6/7] arm64: dts: rockchip: move mmc aliases to board dts on rk3368 Heiko Stuebner
2021-03-24 12:22 ` [PATCH 7/7] arm64: dts: rockchip: move mmc aliases to board dts on rk3399 Heiko Stuebner
2021-04-11 18:55 ` [PATCH 1/7] ARM: dts: rockchip: move rk322x mmcx aliases to board dts files Heiko Stuebner
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=20210324122235.1059292-4-heiko@sntech.de \
--to=heiko@sntech.de \
--cc=arnd@kernel.org \
--cc=heiko.stuebner@theobroma-systems.com \
--cc=jagan@amarulasolutions.com \
--cc=jbx6244@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=robin.murphy@arm.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;
as well as URLs for NNTP newsgroup(s).