diff mbox series

[1/7] ARM: dts: rockchip: move rk322x mmcx aliases to board dts files

Message ID 20210324122235.1059292-1-heiko@sntech.de (mailing list archive)
State New
Headers show
Series [1/7] ARM: dts: rockchip: move rk322x mmcx aliases to board dts files | expand

Commit Message

Heiko Stuebner March 24, 2021, 12:22 p.m. UTC
From: Heiko Stuebner <heiko.stuebner@theobroma-systems.com>

As suggested by Arnd Bergmann, mmc-aliases are supposed to be
board-specific, so move the newly added general aliases to
the board-level on rk322x-based boards.

Suggested-by: Arnd Bergmann <arnd@kernel.org>
Signed-off-by: Heiko Stuebner <heiko.stuebner@theobroma-systems.com>
---
 arch/arm/boot/dts/rk3228-evb.dts  | 4 ++++
 arch/arm/boot/dts/rk3229-evb.dts  | 4 ++++
 arch/arm/boot/dts/rk3229-xms6.dts | 6 ++++++
 arch/arm/boot/dts/rk322x.dtsi     | 3 ---
 4 files changed, 14 insertions(+), 3 deletions(-)

Comments

Heiko Stuebner April 11, 2021, 6:55 p.m. UTC | #1
On Wed, 24 Mar 2021 13:22:29 +0100, Heiko Stuebner wrote:
> As suggested by Arnd Bergmann, mmc-aliases are supposed to be
> board-specific, so move the newly added general aliases to
> the board-level on rk322x-based boards.

Applied, thanks!

[1/7] ARM: dts: rockchip: move rk322x mmcx aliases to board dts files
      commit: 23a52b0dfebf8b9ae44829c561c3d82d8b9c48e3
[2/7] ARM: dts: rockchip: move rv1108 mmcx aliases to board dts files
      commit: e89db2b4c706b9ca1293e7025ef5e8730b5d1b5b
[3/7] arm64: dts: rockchip: move mmc aliases to board dts on px30
      commit: 78b8513b763c121d0ac5ed8fef3188ea065913bb
[4/7] arm64: dts: rockchip: move mmc aliases to board dts on rk3308
      commit: 3f6c22987c0bdfb42b497e346d77b6cdaed55de3
[5/7] arm64: dts: rockchip: move mmc aliases to board dts on rk3328
      commit: 28869aa53506a12d98f6e5ff54b051400be1c2bf
[6/7] arm64: dts: rockchip: move mmc aliases to board dts on rk3368
      commit: 751a78a8bd25ac2634baa19f6f918912360fba93
[7/7] arm64: dts: rockchip: move mmc aliases to board dts on rk3399
      commit: 5dcbe7e3862dfc89d219f37a9ed5e53944fa13c2

Best regards,
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/rk3228-evb.dts b/arch/arm/boot/dts/rk3228-evb.dts
index aed879db6c15..69a5e239ed1a 100644
--- a/arch/arm/boot/dts/rk3228-evb.dts
+++ b/arch/arm/boot/dts/rk3228-evb.dts
@@ -8,6 +8,10 @@  / {
 	model = "Rockchip RK3228 Evaluation board";
 	compatible = "rockchip,rk3228-evb", "rockchip,rk3228";
 
+	aliases {
+		mmc0 = &emmc;
+	};
+
 	memory@60000000 {
 		device_type = "memory";
 		reg = <0x60000000 0x40000000>;
diff --git a/arch/arm/boot/dts/rk3229-evb.dts b/arch/arm/boot/dts/rk3229-evb.dts
index 350497a3ca86..797476e8bef1 100644
--- a/arch/arm/boot/dts/rk3229-evb.dts
+++ b/arch/arm/boot/dts/rk3229-evb.dts
@@ -9,6 +9,10 @@  / {
 	model = "Rockchip RK3229 Evaluation board";
 	compatible = "rockchip,rk3229-evb", "rockchip,rk3229";
 
+	aliases {
+		mmc0 = &emmc;
+	};
+
 	memory@60000000 {
 		device_type = "memory";
 		reg = <0x60000000 0x40000000>;
diff --git a/arch/arm/boot/dts/rk3229-xms6.dts b/arch/arm/boot/dts/rk3229-xms6.dts
index 263393ac4fa6..7bfbfd11fb55 100644
--- a/arch/arm/boot/dts/rk3229-xms6.dts
+++ b/arch/arm/boot/dts/rk3229-xms6.dts
@@ -9,6 +9,12 @@  / {
 	model = "Mecer Xtreme Mini S6";
 	compatible = "mecer,xms6", "rockchip,rk3229";
 
+	aliases {
+		mmc0 = &sdmmc;
+		mmc1 = &sdio;
+		mmc2 = &emmc;
+	};
+
 	memory@60000000 {
 		device_type = "memory";
 		reg = <0x60000000 0x40000000>;
diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
index a4dd50aaf3fc..4d003afd0e3e 100644
--- a/arch/arm/boot/dts/rk322x.dtsi
+++ b/arch/arm/boot/dts/rk322x.dtsi
@@ -14,9 +14,6 @@  / {
 	interrupt-parent = <&gic>;
 
 	aliases {
-		mmc0 = &sdmmc;
-		mmc1 = &sdio;
-		mmc2 = &emmc;
 		serial0 = &uart0;
 		serial1 = &uart1;
 		serial2 = &uart2;