arm64: dts: rockchip: move mmc aliases to board dts on rk3368

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-6-heiko@sntech.de

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
index 87fabc64cc399bca0e2589c26359cb50657c8957..15d1fc541c38e8a03c28dec0578061842947c42c 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
@@ -8,6 +8,10 @@
 #include "rk3368.dtsi"
 
 / {
+       aliases {
+               mmc0 = &emmc;
+       };
+
        chosen {
                stdout-path = "serial2:115200n8";
        };

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts b/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
index 46357d1d77cdc84a8a8f85e398a68a60a8d224ff..62aa97a0b8c9f3d1b094d54d9f24d387a7d4700f 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
@@ -11,6 +11,10 @@
        model = "GeekBox";
        compatible = "geekbuying,geekbox", "rockchip,rk3368";
 
+       aliases {
+               mmc0 = &emmc;
+       };
+
        chosen {
                stdout-path = "serial2:115200n8";
        };

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts
index 7fcb1eacea8acf29cca7cfe4d937ac79c3a99ebe..cae01d35b93d91818ed82818b50151b90d89dd74 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts
@@ -10,6 +10,10 @@
        model = "Theobroma Systems RK3368-uQ7 Baseboard";
        compatible = "tsd,rk3368-lion-haikou", "rockchip,rk3368";
 
+       aliases {
+               mmc1 = &sdmmc;
+       };
+
        chosen {
                stdout-path = "serial0:115200n8";
        };

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
index 24d28be4736cf83e2b5251fc0b9d649d84fdd79d..bcd7977fb0f8ec67ae8413d97ffc9fd3e64afc16 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
@@ -7,6 +7,10 @@
 #include "rk3368.dtsi"
 
 / {
+       aliases {
+               mmc0 = &emmc;
+       };
+
        chosen {
                stdout-path = "serial0:115200n8";
        };

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts b/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
index ecce16ecc9c379d487ed03db96f708baf8ed0e3c..3ebe15e03cf4dea50ccd9bbefcabade5972065a2 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
@@ -11,6 +11,11 @@
        model = "Rockchip Orion R68";
        compatible = "tronsmart,orion-r68-meta", "rockchip,rk3368";
 
+       aliases {
+               mmc0 = &sdmmc;
+               mmc1 = &emmc;
+       };
+
        chosen {
                stdout-path = "serial2:115200n8";
        };

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts
index 5ffd7b4d3036cdab0da3e3af6280824b80b53e78..5ccaa5f7a370b57b6d3d3b9273509cfe0b73103c 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts
@@ -11,6 +11,11 @@
        model = "Rockchip PX5 EVB";
        compatible = "rockchip,px5-evb", "rockchip,px5", "rockchip,rk3368";
 
+       aliases {
+               mmc0 = &sdmmc;
+               mmc1 = &emmc;
+       };
+
        chosen {
                stdout-path = "serial4:115200n8";
        };

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
index 2582fa4b90e2cf75f722cce6fbc54406cee19c3b..959d3cc801f2b16381892c5665bcb88db1d7fa90 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
@@ -11,6 +11,11 @@
        model = "Rockchip R88";
        compatible = "rockchip,r88", "rockchip,rk3368";
 
+       aliases {
+               mmc0 = &sdio0;
+               mmc1 = &emmc;
+       };
+
        chosen {
                stdout-path = "serial2:115200n8";
        };

diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
index 61b0a2a907f22ecaa4f60ac1de355a35ea9bf7d0..242f821a90ba9ddf499c4522ef60710bb469af4f 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
@@ -25,9 +25,6 @@
                i2c3 = &i2c3;
                i2c4 = &i2c4;
                i2c5 = &i2c5;
-               mmc0 = &sdmmc;
-               mmc1 = &sdio0;
-               mmc2 = &emmc;
                serial0 = &uart0;
                serial1 = &uart1;
                serial2 = &uart2;