Commit 28869aa5 authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Heiko Stuebner

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

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: default avatarArnd Bergmann <arnd@kernel.org>
Signed-off-by: default avatarHeiko Stuebner <heiko.stuebner@theobroma-systems.com>
Link: https://lore.kernel.org/r/20210324122235.1059292-5-heiko@sntech.de
parent 3f6c2298
...@@ -8,6 +8,12 @@ / { ...@@ -8,6 +8,12 @@ / {
model = "A95X Z2"; model = "A95X Z2";
compatible = "zkmagic,a95x-z2", "rockchip,rk3318"; compatible = "zkmagic,a95x-z2", "rockchip,rk3318";
aliases {
mmc0 = &sdmmc;
mmc1 = &sdio;
mmc2 = &emmc;
};
chosen { chosen {
stdout-path = "serial2:1500000n8"; stdout-path = "serial2:1500000n8";
}; };
......
...@@ -8,6 +8,11 @@ / { ...@@ -8,6 +8,11 @@ / {
model = "Beelink A1"; model = "Beelink A1";
compatible = "azw,beelink-a1", "rockchip,rk3328"; compatible = "azw,beelink-a1", "rockchip,rk3328";
aliases {
mmc0 = &sdmmc;
mmc1 = &emmc;
};
/* /*
* UART pins, as viewed with bottom of case removed: * UART pins, as viewed with bottom of case removed:
* *
......
...@@ -10,6 +10,12 @@ / { ...@@ -10,6 +10,12 @@ / {
model = "Rockchip RK3328 EVB"; model = "Rockchip RK3328 EVB";
compatible = "rockchip,rk3328-evb", "rockchip,rk3328"; compatible = "rockchip,rk3328-evb", "rockchip,rk3328";
aliases {
mmc0 = &sdmmc;
mmc1 = &sdio;
mmc2 = &emmc;
};
chosen { chosen {
stdout-path = "serial2:1500000n8"; stdout-path = "serial2:1500000n8";
}; };
......
...@@ -13,6 +13,10 @@ / { ...@@ -13,6 +13,10 @@ / {
model = "FriendlyElec NanoPi R2S"; model = "FriendlyElec NanoPi R2S";
compatible = "friendlyarm,nanopi-r2s", "rockchip,rk3328"; compatible = "friendlyarm,nanopi-r2s", "rockchip,rk3328";
aliases {
mmc0 = &sdmmc;
};
chosen { chosen {
stdout-path = "serial2:1500000n8"; stdout-path = "serial2:1500000n8";
}; };
......
...@@ -10,6 +10,11 @@ / { ...@@ -10,6 +10,11 @@ / {
model = "Firefly roc-rk3328-cc"; model = "Firefly roc-rk3328-cc";
compatible = "firefly,roc-rk3328-cc", "rockchip,rk3328"; compatible = "firefly,roc-rk3328-cc", "rockchip,rk3328";
aliases {
mmc0 = &sdmmc;
mmc1 = &emmc;
};
chosen { chosen {
stdout-path = "serial2:1500000n8"; stdout-path = "serial2:1500000n8";
}; };
......
...@@ -20,6 +20,11 @@ / { ...@@ -20,6 +20,11 @@ / {
model = "Radxa ROCK Pi E"; model = "Radxa ROCK Pi E";
compatible = "radxa,rockpi-e", "rockchip,rk3328"; compatible = "radxa,rockpi-e", "rockchip,rk3328";
aliases {
mmc0 = &sdmmc;
mmc1 = &emmc;
};
chosen { chosen {
stdout-path = "serial2:1500000n8"; stdout-path = "serial2:1500000n8";
}; };
......
...@@ -10,6 +10,11 @@ / { ...@@ -10,6 +10,11 @@ / {
model = "Pine64 Rock64"; model = "Pine64 Rock64";
compatible = "pine64,rock64", "rockchip,rk3328"; compatible = "pine64,rock64", "rockchip,rk3328";
aliases {
mmc0 = &sdmmc;
mmc1 = &emmc;
};
chosen { chosen {
stdout-path = "serial2:1500000n8"; stdout-path = "serial2:1500000n8";
}; };
......
...@@ -27,9 +27,6 @@ aliases { ...@@ -27,9 +27,6 @@ aliases {
i2c1 = &i2c1; i2c1 = &i2c1;
i2c2 = &i2c2; i2c2 = &i2c2;
i2c3 = &i2c3; i2c3 = &i2c3;
mmc0 = &sdmmc;
mmc1 = &sdio;
mmc2 = &emmc;
ethernet0 = &gmac2io; ethernet0 = &gmac2io;
ethernet1 = &gmac2phy; ethernet1 = &gmac2phy;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment