tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Arnd Bergmann <arnd@kernel.org>
Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Link: https://lore.kernel.org/r/20210520091822.28491-1-jbx6244@gmail.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

authored by

Johan Jonker and committed by
Heiko Stuebner d67113c2 6e4e4e2a

+35 -3
+5
arch/arm/boot/dts/rk3066a-bqcurie2.dts
··· 12 12 model = "bq Curie 2"; 13 13 compatible = "mundoreader,bq-curie2", "rockchip,rk3066a"; 14 14 15 + aliases { 16 + mmc0 = &mmc0; 17 + mmc1 = &mmc1; 18 + }; 19 + 15 20 memory@60000000 { 16 21 device_type = "memory"; 17 22 reg = <0x60000000 0x40000000>;
+4
arch/arm/boot/dts/rk3066a-marsboard.dts
··· 10 10 model = "MarsBoard RK3066"; 11 11 compatible = "haoyu,marsboard-rk3066", "rockchip,rk3066a"; 12 12 13 + aliases { 14 + mmc0 = &mmc0; 15 + }; 16 + 13 17 memory@60000000 { 14 18 device_type = "memory"; 15 19 reg = <0x60000000 0x40000000>;
+5
arch/arm/boot/dts/rk3066a-mk808.dts
··· 10 10 model = "Rikomagic MK808"; 11 11 compatible = "rikomagic,mk808", "rockchip,rk3066a"; 12 12 13 + aliases { 14 + mmc0 = &mmc0; 15 + mmc1 = &mmc1; 16 + }; 17 + 13 18 chosen { 14 19 stdout-path = "serial2:115200n8"; 15 20 };
+6
arch/arm/boot/dts/rk3066a-rayeager.dts
··· 11 11 model = "Rayeager PX2"; 12 12 compatible = "chipspark,rayeager-px2", "rockchip,rk3066a"; 13 13 14 + aliases { 15 + mmc0 = &mmc0; 16 + mmc1 = &mmc1; 17 + mmc2 = &emmc; 18 + }; 19 + 14 20 memory@60000000 { 15 21 device_type = "memory"; 16 22 reg = <0x60000000 0x40000000>;
+6
arch/arm/boot/dts/rk3188-bqedison2qc.dts
··· 13 13 model = "BQ Edison2 Quad-Core"; 14 14 compatible = "mundoreader,bq-edison2qc", "rockchip,rk3188"; 15 15 16 + aliases { 17 + mmc0 = &mmc0; 18 + mmc1 = &mmc1; 19 + mmc2 = &emmc; 20 + }; 21 + 16 22 memory@60000000 { 17 23 device_type = "memory"; 18 24 reg = <0x60000000 0x80000000>;
+5
arch/arm/boot/dts/rk3188-px3-evb.dts
··· 11 11 model = "Rockchip PX3-EVB"; 12 12 compatible = "rockchip,px3-evb", "rockchip,px3", "rockchip,rk3188"; 13 13 14 + aliases { 15 + mmc0 = &mmc0; 16 + mmc1 = &emmc; 17 + }; 18 + 14 19 chosen { 15 20 stdout-path = "serial2:115200n8"; 16 21 };
+4
arch/arm/boot/dts/rk3188-radxarock.dts
··· 11 11 model = "Radxa Rock"; 12 12 compatible = "radxa,rock", "rockchip,rk3188"; 13 13 14 + aliases { 15 + mmc0 = &mmc0; 16 + }; 17 + 14 18 memory@60000000 { 15 19 device_type = "memory"; 16 20 reg = <0x60000000 0x80000000>;
-3
arch/arm/boot/dts/rk3xxx.dtsi
··· 21 21 i2c2 = &i2c2; 22 22 i2c3 = &i2c3; 23 23 i2c4 = &i2c4; 24 - mshc0 = &emmc; 25 - mshc1 = &mmc0; 26 - mshc2 = &mmc1; 27 24 serial0 = &uart0; 28 25 serial1 = &uart1; 29 26 serial2 = &uart2;