ARM: dts: rockchip: move mmc aliases to board dts on rk3066/rk3188

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: Johan Jonker <jbx6244@gmail.com>
Link: https://lore.kernel.org/r/20210520091822.28491-1-jbx6244@gmail.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
index eba7a134497647bde0fb1ece6a4fde5aa6f2bc86..390aa33cd55ac8a8bc1880869eb86645f034e442 100644 (file)
--- a/arch/arm/boot/dts/rk3066a-bqcurie2.dts
+++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
@@ -12,6 +12,11 @@
        model = "bq Curie 2";
        compatible = "mundoreader,bq-curie2", "rockchip,rk3066a";
 
+       aliases {
+               mmc0 = &mmc0;
+               mmc1 = &mmc1;
+       };
+
        memory@60000000 {
                device_type = "memory";
                reg = <0x60000000 0x40000000>;

diff --git a/arch/arm/boot/dts/rk3066a-marsboard.dts b/arch/arm/boot/dts/rk3066a-marsboard.dts
index 6b121658d93cc24b08a9e0c1fd083735b1daf878..a66d915aa0f65758f1e733cb70ce44bad5de7d77 100644 (file)
--- a/arch/arm/boot/dts/rk3066a-marsboard.dts
+++ b/arch/arm/boot/dts/rk3066a-marsboard.dts
@@ -10,6 +10,10 @@
        model = "MarsBoard RK3066";
        compatible = "haoyu,marsboard-rk3066", "rockchip,rk3066a";
 
+       aliases {
+               mmc0 = &mmc0;
+       };
+
        memory@60000000 {
                device_type = "memory";
                reg = <0x60000000 0x40000000>;

diff --git a/arch/arm/boot/dts/rk3066a-mk808.dts b/arch/arm/boot/dts/rk3066a-mk808.dts
index eed9e60cffa231ec7aec8cccd24eb8e4f0228d34..9790bc63b50a11f4532ad18b34fe95aad8160dfb 100644 (file)
--- a/arch/arm/boot/dts/rk3066a-mk808.dts
+++ b/arch/arm/boot/dts/rk3066a-mk808.dts
@@ -10,6 +10,11 @@
        model = "Rikomagic MK808";
        compatible = "rikomagic,mk808", "rockchip,rk3066a";
 
+       aliases {
+               mmc0 = &mmc0;
+               mmc1 = &mmc1;
+       };
+
        chosen {
                stdout-path = "serial2:115200n8";
        };

diff --git a/arch/arm/boot/dts/rk3066a-rayeager.dts b/arch/arm/boot/dts/rk3066a-rayeager.dts
index a73e8900c924101552b6181352ef08588efe3a6b..12b2e59aebc478bd4881048420c2ad930a0c2877 100644 (file)
--- a/arch/arm/boot/dts/rk3066a-rayeager.dts
+++ b/arch/arm/boot/dts/rk3066a-rayeager.dts
@@ -11,6 +11,12 @@
        model = "Rayeager PX2";
        compatible = "chipspark,rayeager-px2", "rockchip,rk3066a";
 
+       aliases {
+               mmc0 = &mmc0;
+               mmc1 = &mmc1;
+               mmc2 = &emmc;
+       };
+
        memory@60000000 {
                device_type = "memory";
                reg = <0x60000000 0x40000000>;

diff --git a/arch/arm/boot/dts/rk3188-bqedison2qc.dts b/arch/arm/boot/dts/rk3188-bqedison2qc.dts
index 66a0ff196eb1f47f8f56ae9e2522a2e80f126cd6..85d3fce0142f6e24d2c50e6bd7ea60559e8af23b 100644 (file)
--- a/arch/arm/boot/dts/rk3188-bqedison2qc.dts
+++ b/arch/arm/boot/dts/rk3188-bqedison2qc.dts
@@ -13,6 +13,12 @@
        model = "BQ Edison2 Quad-Core";
        compatible = "mundoreader,bq-edison2qc", "rockchip,rk3188";
 
+       aliases {
+               mmc0 = &mmc0;
+               mmc1 = &mmc1;
+               mmc2 = &emmc;
+       };
+
        memory@60000000 {
                device_type = "memory";
                reg = <0x60000000 0x80000000>;

diff --git a/arch/arm/boot/dts/rk3188-px3-evb.dts b/arch/arm/boot/dts/rk3188-px3-evb.dts
index c32e1d441cf70b48fd5121879fb4d0e81f555d42..39c60426c9c95acfe4c6395d11f827300a79073c 100644 (file)
--- a/arch/arm/boot/dts/rk3188-px3-evb.dts
+++ b/arch/arm/boot/dts/rk3188-px3-evb.dts
@@ -11,6 +11,11 @@
        model = "Rockchip PX3-EVB";
        compatible = "rockchip,px3-evb", "rockchip,px3", "rockchip,rk3188";
 
+       aliases {
+               mmc0 = &mmc0;
+               mmc1 = &emmc;
+       };
+
        chosen {
                stdout-path = "serial2:115200n8";
        };

diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts
index b0fef82c0a71b73402611a4939d5c355ec1efb0d..36c0945f43b2285da819c86daf1e7a8c6ebb3353 100644 (file)
--- a/arch/arm/boot/dts/rk3188-radxarock.dts
+++ b/arch/arm/boot/dts/rk3188-radxarock.dts
@@ -11,6 +11,10 @@
        model = "Radxa Rock";
        compatible = "radxa,rock", "rockchip,rk3188";
 
+       aliases {
+               mmc0 = &mmc0;
+       };
+
        memory@60000000 {
                device_type = "memory";
                reg = <0x60000000 0x80000000>;

diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi
index d473552e854747f513ebb0e17210bb1935ef3c4b..f9bbc242444486da32c731ec85957af004b3236d 100644 (file)
--- a/arch/arm/boot/dts/rk3xxx.dtsi
+++ b/arch/arm/boot/dts/rk3xxx.dtsi
@@ -21,9 +21,6 @@
                i2c2 = &i2c2;
                i2c3 = &i2c3;
                i2c4 = &i2c4;
-               mshc0 = &emmc;
-               mshc1 = &mmc0;
-               mshc2 = &mmc1;
                serial0 = &uart0;
                serial1 = &uart1;
                serial2 = &uart2;