ARM: dts: rockchip: move rk322x mmcx aliases to board dts
From: Heiko Stuebner <heiko.stuebner@...> Date: Mon, 22 Mar 2021 20:45:37 +0100
Commit-Message
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@...> Signed-off-by: Heiko Stuebner <heiko.stuebner@...>
Patch-Comment
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(-)
Statistics
- 14 lines added
- 3 lines removed
Changes
----------------------- arch/arm/boot/dts/rk3228-evb.dts -----------------------
index aed879db6c15..69a5e239ed1a 100644
@@ -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>;
----------------------- arch/arm/boot/dts/rk3229-evb.dts -----------------------
index 350497a3ca86..797476e8bef1 100644
@@ -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>;
---------------------- arch/arm/boot/dts/rk3229-xms6.dts -----------------------
index 263393ac4fa6..7bfbfd11fb55 100644
@@ -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>;
------------------------ arch/arm/boot/dts/rk322x.dtsi -------------------------
index a4dd50aaf3fc..4d003afd0e3e 100644
@@ -14,9 +14,6 @@ / {
interrupt-parent = <&gic>;
aliases {
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;