From: Heiko Stuebner <heiko.stuebner@...>
Date: Mon, 22 Mar 2021 21:03:41 +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/rk3318-a95x-z2.dts | 6 ++++++
arch/arm64/boot/dts/rockchip/rk3328-a1.dts | 5 +++++
arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 6 ++++++
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 4 ++++
arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 5 +++++
arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 5 +++++
arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 5 +++++
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 3 ---
8 files changed, 36 insertions(+), 3 deletions(-)
Statistics
- 36 lines added
- 3 lines removed
Changes
@@ -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";
};
@@ -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:
*
@@ -10,6 +10,12 @@ / {
model = "Rockchip RK3328 EVB";
compatible = "rockchip,rk3328-evb", "rockchip,rk3328";
+ aliases {
+ mmc0 = &sdmmc;
+ mmc1 = &sdio;
+ mmc2 = &emmc;
+ };
+
chosen {
stdout-path = "serial2:1500000n8";
};
@@ -13,6 +13,10 @@ / {
model = "FriendlyElec NanoPi R2S";
compatible = "friendlyarm,nanopi-r2s", "rockchip,rk3328";
+ aliases {
+ mmc0 = &sdmmc;
+ };
+
chosen {
stdout-path = "serial2:1500000n8";
};
@@ -10,6 +10,11 @@ / {
model = "Firefly roc-rk3328-cc";
compatible = "firefly,roc-rk3328-cc", "rockchip,rk3328";
+ aliases {
+ mmc0 = &sdmmc;
+ mmc1 = &emmc;
+ };
+
chosen {
stdout-path = "serial2:1500000n8";
};
@@ -20,6 +20,11 @@ / {
model = "Radxa ROCK Pi E";
compatible = "radxa,rockpi-e", "rockchip,rk3328";
+ aliases {
+ mmc0 = &sdmmc;
+ mmc1 = &emmc;
+ };
+
chosen {
stdout-path = "serial2:1500000n8";
};
@@ -10,6 +10,11 @@ / {
model = "Pine64 Rock64";
compatible = "pine64,rock64", "rockchip,rk3328";
+ aliases {
+ mmc0 = &sdmmc;
+ mmc1 = &emmc;
+ };
+
chosen {
stdout-path = "serial2:1500000n8";
};
@@ -27,9 +27,6 @@ aliases {
i2c1 = &i2c1;
i2c2 = &i2c2;
i2c3 = &i2c3;
- mmc0 = &sdmmc;
- mmc1 = &sdio;
- mmc2 = &emmc;
ethernet0 = &gmac2io;
ethernet1 = &gmac2phy;
};