ARM: dts: rockchip: move rk322x mmcx aliases to board dts files

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>
Link: https://lore.kernel.org/r/20210324122235.1059292-1-heiko@sntech.de

diff --git a/arch/arm/boot/dts/rk3228-evb.dts b/arch/arm/boot/dts/rk3228-evb.dts
index aed879d..69a5e23 100644 (file)
--- 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 350497a..797476e 100644 (file)
--- 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 263393a..7bfbfd1 100644 (file)
--- 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 118d964..208f212 100644 (file)
--- 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;