From: Heiko Stuebner <heiko.stuebner@...>
Date: Mon, 22 Mar 2021 21:08:27 +0100
Commit-Message
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@...>
Signed-off-by: Heiko Stuebner <heiko.stuebner@...>
Patch-Comment
arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 4 ++++
arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts | 4 ++++
arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts | 4 ++++
arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi | 4 ++++
arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts | 5 +++++
arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts | 5 +++++
arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 5 +++++
arch/arm64/boot/dts/rockchip/rk3368.dtsi | 3 ---
8 files changed, 31 insertions(+), 3 deletions(-)
Statistics
- 31 lines added
- 3 lines removed
Changes
@@ -8,6 +8,10 @@
#include "rk3368.dtsi"
/ {
+ aliases {
+ mmc0 = &emmc;
+ };
+
chosen {
stdout-path = "serial2:115200n8";
};
@@ -11,6 +11,10 @@ / {
model = "GeekBox";
compatible = "geekbuying,geekbox", "rockchip,rk3368";
+ aliases {
+ mmc0 = &emmc;
+ };
+
chosen {
stdout-path = "serial2:115200n8";
};
@@ -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";
};
@@ -7,6 +7,10 @@
#include "rk3368.dtsi"
/ {
+ aliases {
+ mmc0 = &emmc;
+ };
+
chosen {
stdout-path = "serial0:115200n8";
};
@@ -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";
};
@@ -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";
};
@@ -11,6 +11,11 @@ / {
model = "Rockchip R88";
compatible = "rockchip,r88", "rockchip,rk3368";
+ aliases {
+ mmc0 = &sdio0;
+ mmc1 = &emmc;
+ };
+
chosen {
stdout-path = "serial2:115200n8";
};
@@ -26,9 +26,6 @@ aliases {
i2c3 = &i2c3;
i2c4 = &i2c4;
i2c5 = &i2c5;
- mmc0 = &sdmmc;
- mmc1 = &sdio0;
- mmc2 = &emmc;
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;