Commit 751a78a8 authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Heiko Stuebner

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: 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-6-heiko@sntech.de
parent 28869aa5
...@@ -8,6 +8,10 @@ ...@@ -8,6 +8,10 @@
#include "rk3368.dtsi" #include "rk3368.dtsi"
/ { / {
aliases {
mmc0 = &emmc;
};
chosen { chosen {
stdout-path = "serial2:115200n8"; stdout-path = "serial2:115200n8";
}; };
......
...@@ -11,6 +11,10 @@ / { ...@@ -11,6 +11,10 @@ / {
model = "GeekBox"; model = "GeekBox";
compatible = "geekbuying,geekbox", "rockchip,rk3368"; compatible = "geekbuying,geekbox", "rockchip,rk3368";
aliases {
mmc0 = &emmc;
};
chosen { chosen {
stdout-path = "serial2:115200n8"; stdout-path = "serial2:115200n8";
}; };
......
...@@ -10,6 +10,10 @@ / { ...@@ -10,6 +10,10 @@ / {
model = "Theobroma Systems RK3368-uQ7 Baseboard"; model = "Theobroma Systems RK3368-uQ7 Baseboard";
compatible = "tsd,rk3368-lion-haikou", "rockchip,rk3368"; compatible = "tsd,rk3368-lion-haikou", "rockchip,rk3368";
aliases {
mmc1 = &sdmmc;
};
chosen { chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
......
...@@ -7,6 +7,10 @@ ...@@ -7,6 +7,10 @@
#include "rk3368.dtsi" #include "rk3368.dtsi"
/ { / {
aliases {
mmc0 = &emmc;
};
chosen { chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
......
...@@ -11,6 +11,11 @@ / { ...@@ -11,6 +11,11 @@ / {
model = "Rockchip Orion R68"; model = "Rockchip Orion R68";
compatible = "tronsmart,orion-r68-meta", "rockchip,rk3368"; compatible = "tronsmart,orion-r68-meta", "rockchip,rk3368";
aliases {
mmc0 = &sdmmc;
mmc1 = &emmc;
};
chosen { chosen {
stdout-path = "serial2:115200n8"; stdout-path = "serial2:115200n8";
}; };
......
...@@ -11,6 +11,11 @@ / { ...@@ -11,6 +11,11 @@ / {
model = "Rockchip PX5 EVB"; model = "Rockchip PX5 EVB";
compatible = "rockchip,px5-evb", "rockchip,px5", "rockchip,rk3368"; compatible = "rockchip,px5-evb", "rockchip,px5", "rockchip,rk3368";
aliases {
mmc0 = &sdmmc;
mmc1 = &emmc;
};
chosen { chosen {
stdout-path = "serial4:115200n8"; stdout-path = "serial4:115200n8";
}; };
......
...@@ -11,6 +11,11 @@ / { ...@@ -11,6 +11,11 @@ / {
model = "Rockchip R88"; model = "Rockchip R88";
compatible = "rockchip,r88", "rockchip,rk3368"; compatible = "rockchip,r88", "rockchip,rk3368";
aliases {
mmc0 = &sdio0;
mmc1 = &emmc;
};
chosen { chosen {
stdout-path = "serial2:115200n8"; stdout-path = "serial2:115200n8";
}; };
......
...@@ -25,9 +25,6 @@ aliases { ...@@ -25,9 +25,6 @@ aliases {
i2c3 = &i2c3; i2c3 = &i2c3;
i2c4 = &i2c4; i2c4 = &i2c4;
i2c5 = &i2c5; i2c5 = &i2c5;
mmc0 = &sdmmc;
mmc1 = &sdio0;
mmc2 = &emmc;
serial0 = &uart0; serial0 = &uart0;
serial1 = &uart1; serial1 = &uart1;
serial2 = &uart2; serial2 = &uart2;
......
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