Commit d67113c2 authored by Johan Jonker's avatar Johan Jonker Committed by Heiko Stuebner

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: default avatarArnd Bergmann <arnd@kernel.org>
Signed-off-by: default avatarJohan Jonker <jbx6244@gmail.com>
Link: https://lore.kernel.org/r/20210520091822.28491-1-jbx6244@gmail.comSigned-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 6e4e4e2a
...@@ -12,6 +12,11 @@ / { ...@@ -12,6 +12,11 @@ / {
model = "bq Curie 2"; model = "bq Curie 2";
compatible = "mundoreader,bq-curie2", "rockchip,rk3066a"; compatible = "mundoreader,bq-curie2", "rockchip,rk3066a";
aliases {
mmc0 = &mmc0;
mmc1 = &mmc1;
};
memory@60000000 { memory@60000000 {
device_type = "memory"; device_type = "memory";
reg = <0x60000000 0x40000000>; reg = <0x60000000 0x40000000>;
......
...@@ -10,6 +10,10 @@ / { ...@@ -10,6 +10,10 @@ / {
model = "MarsBoard RK3066"; model = "MarsBoard RK3066";
compatible = "haoyu,marsboard-rk3066", "rockchip,rk3066a"; compatible = "haoyu,marsboard-rk3066", "rockchip,rk3066a";
aliases {
mmc0 = &mmc0;
};
memory@60000000 { memory@60000000 {
device_type = "memory"; device_type = "memory";
reg = <0x60000000 0x40000000>; reg = <0x60000000 0x40000000>;
......
...@@ -10,6 +10,11 @@ / { ...@@ -10,6 +10,11 @@ / {
model = "Rikomagic MK808"; model = "Rikomagic MK808";
compatible = "rikomagic,mk808", "rockchip,rk3066a"; compatible = "rikomagic,mk808", "rockchip,rk3066a";
aliases {
mmc0 = &mmc0;
mmc1 = &mmc1;
};
chosen { chosen {
stdout-path = "serial2:115200n8"; stdout-path = "serial2:115200n8";
}; };
......
...@@ -11,6 +11,12 @@ / { ...@@ -11,6 +11,12 @@ / {
model = "Rayeager PX2"; model = "Rayeager PX2";
compatible = "chipspark,rayeager-px2", "rockchip,rk3066a"; compatible = "chipspark,rayeager-px2", "rockchip,rk3066a";
aliases {
mmc0 = &mmc0;
mmc1 = &mmc1;
mmc2 = &emmc;
};
memory@60000000 { memory@60000000 {
device_type = "memory"; device_type = "memory";
reg = <0x60000000 0x40000000>; reg = <0x60000000 0x40000000>;
......
...@@ -13,6 +13,12 @@ / { ...@@ -13,6 +13,12 @@ / {
model = "BQ Edison2 Quad-Core"; model = "BQ Edison2 Quad-Core";
compatible = "mundoreader,bq-edison2qc", "rockchip,rk3188"; compatible = "mundoreader,bq-edison2qc", "rockchip,rk3188";
aliases {
mmc0 = &mmc0;
mmc1 = &mmc1;
mmc2 = &emmc;
};
memory@60000000 { memory@60000000 {
device_type = "memory"; device_type = "memory";
reg = <0x60000000 0x80000000>; reg = <0x60000000 0x80000000>;
......
...@@ -11,6 +11,11 @@ / { ...@@ -11,6 +11,11 @@ / {
model = "Rockchip PX3-EVB"; model = "Rockchip PX3-EVB";
compatible = "rockchip,px3-evb", "rockchip,px3", "rockchip,rk3188"; compatible = "rockchip,px3-evb", "rockchip,px3", "rockchip,rk3188";
aliases {
mmc0 = &mmc0;
mmc1 = &emmc;
};
chosen { chosen {
stdout-path = "serial2:115200n8"; stdout-path = "serial2:115200n8";
}; };
......
...@@ -11,6 +11,10 @@ / { ...@@ -11,6 +11,10 @@ / {
model = "Radxa Rock"; model = "Radxa Rock";
compatible = "radxa,rock", "rockchip,rk3188"; compatible = "radxa,rock", "rockchip,rk3188";
aliases {
mmc0 = &mmc0;
};
memory@60000000 { memory@60000000 {
device_type = "memory"; device_type = "memory";
reg = <0x60000000 0x80000000>; reg = <0x60000000 0x80000000>;
......
...@@ -21,9 +21,6 @@ aliases { ...@@ -21,9 +21,6 @@ aliases {
i2c2 = &i2c2; i2c2 = &i2c2;
i2c3 = &i2c3; i2c3 = &i2c3;
i2c4 = &i2c4; i2c4 = &i2c4;
mshc0 = &emmc;
mshc1 = &mmc0;
mshc2 = &mmc1;
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