ARM: dts: rockchip: move rv1108 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 rv1108-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-2-heiko@sntech.de

diff --git a/arch/arm/boot/dts/rv1108-elgin-r1.dts b/arch/arm/boot/dts/rv1108-elgin-r1.dts
index b1db924710c80e1dcdd1d20f33fc5fcb0f0e1d8d..f62c9f7af79db923324bcfedce1acebca8f994c9 100644 (file)
--- a/arch/arm/boot/dts/rv1108-elgin-r1.dts
+++ b/arch/arm/boot/dts/rv1108-elgin-r1.dts
@@ -12,6 +12,10 @@
        model = "Elgin RV1108 R1 board";
        compatible = "elgin,rv1108-r1", "rockchip,rv1108";
 
+       aliases {
+               mmc0 = &emmc;
+       };
+
        memory@60000000 {
                device_type = "memory";
                reg = <0x60000000 0x08000000>;

diff --git a/arch/arm/boot/dts/rv1108-evb.dts b/arch/arm/boot/dts/rv1108-evb.dts
index 30f3d0470ad9805e6a3b61082cfcc1be83edfc2b..fe5fc9bf75c9980d769806a8ed2f3b0d3f0507de 100644 (file)
--- a/arch/arm/boot/dts/rv1108-evb.dts
+++ b/arch/arm/boot/dts/rv1108-evb.dts
@@ -8,6 +8,10 @@
        model = "Rockchip RV1108 Evaluation board";
        compatible = "rockchip,rv1108-evb", "rockchip,rv1108";
 
+       aliases {
+               mmc0 = &sdmmc;
+       };
+
        memory@60000000 {
                device_type = "memory";
                reg = <0x60000000 0x08000000>;

diff --git a/arch/arm/boot/dts/rv1108.dtsi b/arch/arm/boot/dts/rv1108.dtsi
index 68e2282f7e86297ebc550e218e30c359547d79ea..884872ca5207f8e974e3bebe851c355c8f467314 100644 (file)
--- a/arch/arm/boot/dts/rv1108.dtsi
+++ b/arch/arm/boot/dts/rv1108.dtsi
@@ -19,9 +19,6 @@
                i2c1 = &i2c1;
                i2c2 = &i2c2;
                i2c3 = &i2c3;
-               mmc0 = &emmc;
-               mmc1 = &sdio;
-               mmc2 = &sdmmc;
                serial0 = &uart0;
                serial1 = &uart1;
                serial2 = &uart2;