arm64: dts: rockchip: move mmc aliases to board dts on rk3328
authorHeiko Stuebner <heiko.stuebner@theobroma-systems.com>
Wed, 24 Mar 2021 12:22:33 +0000 (13:22 +0100)
committerHeiko Stuebner <heiko@sntech.de>
Sun, 11 Apr 2021 09:13:06 +0000 (11:13 +0200)
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>
Link: https://lore.kernel.org/r/20210324122235.1059292-5-heiko@sntech.de
arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts
arch/arm64/boot/dts/rockchip/rk3328-a1.dts
arch/arm64/boot/dts/rockchip/rk3328-evb.dts
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
arch/arm64/boot/dts/rockchip/rk3328.dtsi

index e71870768611c73fab3db2dd29b29763566eacd2..763cf9b4620eb687786cad50a2f579659e60959f 100644 (file)
@@ -8,6 +8,12 @@
        model = "A95X Z2";
        compatible = "zkmagic,a95x-z2", "rockchip,rk3318";
 
+       aliases {
+               mmc0 = &sdmmc;
+               mmc1 = &sdio;
+               mmc2 = &emmc;
+       };
+
        chosen {
                stdout-path = "serial2:1500000n8";
        };
index 37f307cfa4cc7bf84e4fabf3ee7e1158119be35f..de2d3e88e27fcb2b401be24704ab99e24eb61e81 100644 (file)
@@ -8,6 +8,11 @@
        model = "Beelink A1";
        compatible = "azw,beelink-a1", "rockchip,rk3328";
 
+       aliases {
+               mmc0 = &sdmmc;
+               mmc1 = &emmc;
+       };
+
        /*
         * UART pins, as viewed with bottom of case removed:
         *
index a48767931af6fa074e4cb2a5f39af0fb1714a709..ff6b466e0e07442b10ba97d9ba129f1cc36fbeb8 100644 (file)
        model = "Rockchip RK3328 EVB";
        compatible = "rockchip,rk3328-evb", "rockchip,rk3328";
 
+       aliases {
+               mmc0 = &sdmmc;
+               mmc1 = &sdio;
+               mmc2 = &emmc;
+       };
+
        chosen {
                stdout-path = "serial2:1500000n8";
        };
index faf496d789cf860f2b525c3fb87d5084ed0df65c..f807bc066ccb9c085d6be7e085a5bf993c07e0f3 100644 (file)
        model = "FriendlyElec NanoPi R2S";
        compatible = "friendlyarm,nanopi-r2s", "rockchip,rk3328";
 
+       aliases {
+               mmc0 = &sdmmc;
+       };
+
        chosen {
                stdout-path = "serial2:1500000n8";
        };
index 19959bfba4519bd6aab2ce18c85314abc7032caf..a05732b59f38043049442b59fdc522681255047c 100644 (file)
        model = "Firefly roc-rk3328-cc";
        compatible = "firefly,roc-rk3328-cc", "rockchip,rk3328";
 
+       aliases {
+               mmc0 = &sdmmc;
+               mmc1 = &emmc;
+       };
+
        chosen {
                stdout-path = "serial2:1500000n8";
        };
index 2d71ca7e429c1609149fd69225af9fe3473f9e38..c7e31efdd2e112d0da099f05c4580f7399b21ebe 100644 (file)
        model = "Radxa ROCK Pi E";
        compatible = "radxa,rockpi-e", "rockchip,rk3328";
 
+       aliases {
+               mmc0 = &sdmmc;
+               mmc1 = &emmc;
+       };
+
        chosen {
                stdout-path = "serial2:1500000n8";
        };
index c984662043da81964e108697274dc3709be2d90b..3bef1f39bc6e13e45db0124b7607050685f60e93 100644 (file)
        model = "Pine64 Rock64";
        compatible = "pine64,rock64", "rockchip,rk3328";
 
+       aliases {
+               mmc0 = &sdmmc;
+               mmc1 = &emmc;
+       };
+
        chosen {
                stdout-path = "serial2:1500000n8";
        };
index c2ca358c7e304888949a0a49e59ddd8da1166eeb..5bab617847350250e429c79f37aaef1117920668 100644 (file)
@@ -27,9 +27,6 @@
                i2c1 = &i2c1;
                i2c2 = &i2c2;
                i2c3 = &i2c3;
-               mmc0 = &sdmmc;
-               mmc1 = &sdio;
-               mmc2 = &emmc;
                ethernet0 = &gmac2io;
                ethernet1 = &gmac2phy;
        };